diff options
author | Julian Eisel <julian@blender.org> | 2020-04-03 19:24:08 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-04-03 19:25:52 +0300 |
commit | 63922c5056d16cc91c30ec3476a28d523adbdbea (patch) | |
tree | 4255e7ff9067cff9e74bd51aac5fb350bf7d8575 /source/blender/render | |
parent | 70b061b4fdd487c971b12fd0f772767387ebc8f4 (diff) |
Cleanup: Rename ExtensionRNA variables from ext to rna_ext
Makes it more clear that code using this is related to the RNA
integration of a type.
Part of T74432.
Also ran clang-format on affected files.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/external_engine.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 0b5b62e2f08..fd55a2a01df 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -110,7 +110,7 @@ typedef struct RenderEngineType { struct DrawEngineType *draw_engine; /* RNA integration */ - ExtensionRNA ext; + ExtensionRNA rna_ext; } RenderEngineType; typedef void (*update_render_passes_cb_t)(void *userdata, diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 7c071bb6b04..ffd483a8b62 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -87,8 +87,8 @@ void RE_engines_exit(void) BLI_remlink(&R_engines, type); if (!(type->flag & RE_INTERNAL)) { - if (type->ext.free) { - type->ext.free(type->ext.data); + if (type->rna_ext.free) { + type->rna_ext.free(type->rna_ext.data); } MEM_freeN(type); |