Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-04-03 19:24:08 +0300
committerJulian Eisel <julian@blender.org>2020-04-03 19:25:52 +0300
commit63922c5056d16cc91c30ec3476a28d523adbdbea (patch)
tree4255e7ff9067cff9e74bd51aac5fb350bf7d8575 /source/blender/makesrna/intern/rna_render.c
parent70b061b4fdd487c971b12fd0f772767387ebc8f4 (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/makesrna/intern/rna_render.c')
-rw-r--r--source/blender/makesrna/intern/rna_render.c49
1 files changed, 25 insertions, 24 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 40a2aeb5bd5..8322c7ad5f4 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -148,13 +148,13 @@ static void engine_update(RenderEngine *engine, Main *bmain, Depsgraph *depsgrap
ParameterList list;
FunctionRNA *func;
- RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
+ RNA_pointer_create(NULL, engine->type->rna_ext.srna, engine, &ptr);
func = &rna_RenderEngine_update_func;
RNA_parameter_list_create(&list, &ptr, func);
RNA_parameter_set_lookup(&list, "data", &bmain);
RNA_parameter_set_lookup(&list, "depsgraph", &depsgraph);
- engine->type->ext.call(NULL, &ptr, func, &list);
+ engine->type->rna_ext.call(NULL, &ptr, func, &list);
RNA_parameter_list_free(&list);
}
@@ -166,12 +166,12 @@ static void engine_render(RenderEngine *engine, Depsgraph *depsgraph)
ParameterList list;
FunctionRNA *func;
- RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
+ RNA_pointer_create(NULL, engine->type->rna_ext.srna, engine, &ptr);
func = &rna_RenderEngine_render_func;
RNA_parameter_list_create(&list, &ptr, func);
RNA_parameter_set_lookup(&list, "depsgraph", &depsgraph);
- engine->type->ext.call(NULL, &ptr, func, &list);
+ engine->type->rna_ext.call(NULL, &ptr, func, &list);
RNA_parameter_list_free(&list);
}
@@ -192,7 +192,7 @@ static void engine_bake(RenderEngine *engine,
ParameterList list;
FunctionRNA *func;
- RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
+ RNA_pointer_create(NULL, engine->type->rna_ext.srna, engine, &ptr);
func = &rna_RenderEngine_bake_func;
RNA_parameter_list_create(&list, &ptr, func);
@@ -205,7 +205,7 @@ static void engine_bake(RenderEngine *engine,
RNA_parameter_set_lookup(&list, "num_pixels", &num_pixels);
RNA_parameter_set_lookup(&list, "depth", &depth);
RNA_parameter_set_lookup(&list, "result", &result);
- engine->type->ext.call(NULL, &ptr, func, &list);
+ engine->type->rna_ext.call(NULL, &ptr, func, &list);
RNA_parameter_list_free(&list);
}
@@ -219,13 +219,13 @@ static void engine_view_update(RenderEngine *engine,
ParameterList list;
FunctionRNA *func;
- RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
+ RNA_pointer_create(NULL, engine->type->rna_ext.srna, engine, &ptr);
func = &rna_RenderEngine_view_update_func;
RNA_parameter_list_create(&list, &ptr, func);
RNA_parameter_set_lookup(&list, "context", &context);
RNA_parameter_set_lookup(&list, "depsgraph", &depsgraph);
- engine->type->ext.call(NULL, &ptr, func, &list);
+ engine->type->rna_ext.call(NULL, &ptr, func, &list);
RNA_parameter_list_free(&list);
}
@@ -239,13 +239,13 @@ static void engine_view_draw(RenderEngine *engine,
ParameterList list;
FunctionRNA *func;
- RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
+ RNA_pointer_create(NULL, engine->type->rna_ext.srna, engine, &ptr);
func = &rna_RenderEngine_view_draw_func;
RNA_parameter_list_create(&list, &ptr, func);
RNA_parameter_set_lookup(&list, "context", &context);
RNA_parameter_set_lookup(&list, "depsgraph", &depsgraph);
- engine->type->ext.call(NULL, &ptr, func, &list);
+ engine->type->rna_ext.call(NULL, &ptr, func, &list);
RNA_parameter_list_free(&list);
}
@@ -259,13 +259,13 @@ static void engine_update_script_node(RenderEngine *engine,
ParameterList list;
FunctionRNA *func;
- RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
+ RNA_pointer_create(NULL, engine->type->rna_ext.srna, engine, &ptr);
RNA_pointer_create((ID *)ntree, &RNA_Node, node, &nodeptr);
func = &rna_RenderEngine_update_script_node_func;
RNA_parameter_list_create(&list, &ptr, func);
RNA_parameter_set_lookup(&list, "node", &nodeptr);
- engine->type->ext.call(NULL, &ptr, func, &list);
+ engine->type->rna_ext.call(NULL, &ptr, func, &list);
RNA_parameter_list_free(&list);
}
@@ -279,13 +279,13 @@ static void engine_update_render_passes(RenderEngine *engine,
ParameterList list;
FunctionRNA *func;
- RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
+ RNA_pointer_create(NULL, engine->type->rna_ext.srna, engine, &ptr);
func = &rna_RenderEngine_update_render_passes_func;
RNA_parameter_list_create(&list, &ptr, func);
RNA_parameter_set_lookup(&list, "scene", &scene);
RNA_parameter_set_lookup(&list, "renderlayer", &view_layer);
- engine->type->ext.call(NULL, &ptr, func, &list);
+ engine->type->rna_ext.call(NULL, &ptr, func, &list);
RNA_parameter_list_free(&list);
}
@@ -300,7 +300,7 @@ static void rna_RenderEngine_unregister(Main *bmain, StructRNA *type)
return;
}
- RNA_struct_free_extension(type, &et->ext);
+ RNA_struct_free_extension(type, &et->rna_ext);
RNA_struct_free(&BLENDER_RNA, type);
BLI_freelinkN(&R_engines, et);
@@ -343,8 +343,8 @@ static StructRNA *rna_RenderEngine_register(Main *bmain,
/* check if we have registered this engine type before, and remove it */
for (et = R_engines.first; et; et = et->next) {
if (STREQ(et->idname, dummyet.idname)) {
- if (et->ext.srna) {
- rna_RenderEngine_unregister(bmain, et->ext.srna);
+ if (et->rna_ext.srna) {
+ rna_RenderEngine_unregister(bmain, et->rna_ext.srna);
}
break;
}
@@ -354,11 +354,11 @@ static StructRNA *rna_RenderEngine_register(Main *bmain,
et = MEM_mallocN(sizeof(RenderEngineType), "python render engine");
memcpy(et, &dummyet, sizeof(dummyet));
- et->ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, et->idname, &RNA_RenderEngine);
- et->ext.data = data;
- et->ext.call = call;
- et->ext.free = free;
- RNA_struct_blender_type_set(et->ext.srna, et);
+ et->rna_ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, et->idname, &RNA_RenderEngine);
+ et->rna_ext.data = data;
+ et->rna_ext.call = call;
+ et->rna_ext.free = free;
+ RNA_struct_blender_type_set(et->rna_ext.srna, et);
et->update = (have_function[0]) ? engine_update : NULL;
et->render = (have_function[1]) ? engine_render : NULL;
@@ -370,7 +370,7 @@ static StructRNA *rna_RenderEngine_register(Main *bmain,
RE_engines_register(et);
- return et->ext.srna;
+ return et->rna_ext.srna;
}
static void **rna_RenderEngine_instance(PointerRNA *ptr)
@@ -382,7 +382,8 @@ static void **rna_RenderEngine_instance(PointerRNA *ptr)
static StructRNA *rna_RenderEngine_refine(PointerRNA *ptr)
{
RenderEngine *engine = (RenderEngine *)ptr->data;
- return (engine->type && engine->type->ext.srna) ? engine->type->ext.srna : &RNA_RenderEngine;
+ return (engine->type && engine->type->rna_ext.srna) ? engine->type->rna_ext.srna :
+ &RNA_RenderEngine;
}
static PointerRNA rna_RenderEngine_render_get(PointerRNA *ptr)