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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-28 17:06:32 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-28 17:06:32 +0300
commit178ea1f7982922f319e55de9288352d3a3e4af43 (patch)
tree9c9e5f2c8b534318b9448d2053a7a29a222765a2 /source/blender/makesrna/intern
parente5a74f3ad31e1ee55e086de682c7d01b8d27697e (diff)
Cleanup, naming of engine type variable
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r--source/blender/makesrna/intern/rna_context.c8
-rw-r--r--source/blender/makesrna/intern/rna_scene_api.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c
index 911f2cca2f6..6e6aca2d98d 100644
--- a/source/blender/makesrna/intern/rna_context.c
+++ b/source/blender/makesrna/intern/rna_context.c
@@ -144,15 +144,15 @@ static PointerRNA rna_Context_view_render_get(PointerRNA *ptr)
static void rna_Context_engine_get(PointerRNA *ptr, char *value)
{
bContext *C = (bContext *)ptr->data;
- RenderEngineType *engine = CTX_data_engine(C);
- strcpy(value, engine->idname);
+ RenderEngineType *engine_type = CTX_data_engine(C);
+ strcpy(value, engine_type->idname);
}
static int rna_Context_engine_length(PointerRNA *ptr)
{
bContext *C = (bContext *)ptr->data;
- RenderEngineType *engine = CTX_data_engine(C);
- return strlen(engine->idname);
+ RenderEngineType *engine_type = CTX_data_engine(C);
+ return strlen(engine_type->idname);
}
static PointerRNA rna_Context_scene_collection_get(PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index b245d12bbd5..7d8bf4949d5 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -176,19 +176,19 @@ static void rna_Scene_ray_cast(
int *r_success, float r_location[3], float r_normal[3], int *r_index,
Object **r_ob, float r_obmat[16])
{
- RenderEngineType *engine;
+ RenderEngineType *engine_type;
if (engine_id == NULL || engine_id[0] == '\0') {
- engine = RE_engines_find(scene->view_render.engine_id);
+ engine_type = RE_engines_find(scene->view_render.engine_id);
}
else {
- engine = RE_engines_find(engine_id);
+ engine_type = RE_engines_find(engine_id);
}
normalize_v3(direction);
SnapObjectContext *sctx = ED_transform_snap_object_context_create(
- G.main, scene, view_layer, engine, 0);
+ G.main, scene, view_layer, engine_type, 0);
bool ret = ED_transform_snap_object_project_ray_ex(
sctx,