diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-09 17:32:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-09 17:45:21 +0300 |
| commit | 2466afd089ee370c7b6ccb288fc38fdcc6152805 (patch) | |
| tree | 0aec2de6c9023f38ea055a16f63ac18b223e4bba /source/blender/makesrna/intern/rna_object_api.c | |
| parent | 859417c65796a48599eb073bcfe03f2382110f38 (diff) | |
Cleanup: Use full name for scene_layer in makesrna
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 01370412978..9079963607f 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -93,11 +93,11 @@ static const EnumPropertyItem space_items[] = { static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports, int action) { - SceneLayer *sl = CTX_data_scene_layer(C); - Base *base = BKE_scene_layer_base_find(sl, ob); + SceneLayer *scene_layer = CTX_data_scene_layer(C); + Base *base = BKE_scene_layer_base_find(scene_layer, ob); if (!base) { - BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, sl->name); + BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name); return; } @@ -116,18 +116,18 @@ static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports, break; case 0: /* SELECT */ default: - BKE_scene_layer_base_select(sl, base); + BKE_scene_layer_base_select(scene_layer, base); break; } } static int rna_Object_select_get(Object *ob, bContext *C, ReportList *reports) { - SceneLayer *sl = CTX_data_scene_layer(C); - Base *base = BKE_scene_layer_base_find(sl, ob); + SceneLayer *scene_layer = CTX_data_scene_layer(C); + Base *base = BKE_scene_layer_base_find(scene_layer, ob); if (!base) { - BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, sl->name); + BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name); return -1; } @@ -136,11 +136,11 @@ static int rna_Object_select_get(Object *ob, bContext *C, ReportList *reports) static int rna_Object_visible_get(Object *ob, bContext *C, ReportList *reports) { - SceneLayer *sl = CTX_data_scene_layer(C); - Base *base = BKE_scene_layer_base_find(sl, ob); + SceneLayer *scene_layer = CTX_data_scene_layer(C); + Base *base = BKE_scene_layer_base_find(scene_layer, ob); if (!base) { - BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, sl->name); + BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name); return -1; } @@ -197,12 +197,12 @@ static void rna_Object_camera_fit_coords( /* copied from Mesh_getFromObject and adapted to RNA interface */ /* settings: 0 - preview, 1 - render */ static Mesh *rna_Object_to_mesh( - Object *ob, bContext *C, ReportList *reports, Scene *sce, SceneLayer *sl, + Object *ob, bContext *C, ReportList *reports, Scene *sce, SceneLayer *scene_layer, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed) { Main *bmain = CTX_data_main(C); - return rna_Main_meshes_new_from_object(bmain, reports, sce, sl, ob, apply_modifiers, settings, calc_tessface, calc_undeformed); + return rna_Main_meshes_new_from_object(bmain, reports, sce, scene_layer, ob, apply_modifiers, settings, calc_tessface, calc_undeformed); } /* mostly a copy from convertblender.c */ |