diff options
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 016c0e75331..dfb001bfe14 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -428,7 +428,7 @@ Object *ED_object_add_type( { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - ViewLayer *sl = CTX_data_view_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Object *ob; /* for as long scene has editmode... */ @@ -436,12 +436,12 @@ Object *ED_object_add_type( ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); /* freedata, and undo */ /* deselects all, sets scene->basact */ - ob = BKE_object_add(bmain, scene, sl, type, name); + ob = BKE_object_add(bmain, scene, view_layer, type, name); /* editor level activate, notifiers */ - ED_object_base_activate(C, sl->basact); + ED_object_base_activate(C, view_layer->basact); /* more editor stuff */ - ED_object_base_init_transform(C, sl->basact, loc, rot); + ED_object_base_init_transform(C, view_layer->basact, loc, rot); /* Ignore collisions by default for non-mesh objects */ if (type != OB_MESH) { @@ -1426,7 +1426,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, const bool use_hierarchy) { Main *bmain = CTX_data_main(C); - ViewLayer *sl = CTX_data_view_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); ListBase *lb_duplis; DupliObject *dob; GHash *dupli_gh, *parent_gh = NULL; @@ -1460,7 +1460,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base, } BKE_collection_object_add_from(scene, base->object, ob_dst); - base_dst = BKE_view_layer_base_find(sl, ob_dst); + base_dst = BKE_view_layer_base_find(view_layer, ob_dst); BLI_assert(base_dst != NULL); BKE_scene_object_base_flag_sync_from_base(base_dst); @@ -1674,7 +1674,7 @@ static int convert_poll(bContext *C) } /* Helper for convert_exec */ -static Base *duplibase_for_convert(Main *bmain, Scene *scene, ViewLayer *sl, Base *base, Object *ob) +static Base *duplibase_for_convert(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, Object *ob) { Object *obn; Base *basen; @@ -1687,7 +1687,7 @@ static Base *duplibase_for_convert(Main *bmain, Scene *scene, ViewLayer *sl, Bas DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); BKE_collection_object_add_from(scene, ob, obn); - basen = BKE_view_layer_base_find(sl, obn); + basen = BKE_view_layer_base_find(view_layer, obn); ED_object_base_select(basen, BA_SELECT); ED_object_base_select(basen, BA_DESELECT); return basen; @@ -2077,7 +2077,7 @@ void OBJECT_OT_convert(wmOperatorType *ot) /* used below, assumes id.new is correct */ /* leaves selection of base/object unaltered */ /* Does set ID->newid pointers. */ -static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer *sl, Object *ob, int dupflag) +static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer *view_layer, Object *ob, int dupflag) { #define ID_NEW_REMAP_US(a) if ( (a)->id.newid) { (a) = (void *)(a)->id.newid; (a)->id.us++; } #define ID_NEW_REMAP_US2(a) if (((ID *)a)->newid) { (a) = ((ID *)a)->newid; ((ID *)a)->us++; } @@ -2096,7 +2096,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); BKE_collection_object_add_from(scene, ob, obn); - basen = BKE_view_layer_base_find(sl, obn); + basen = BKE_view_layer_base_find(view_layer, obn); /* 1) duplis should end up in same group as the original * 2) Rigid Body sim participants MUST always be part of a group... @@ -2319,14 +2319,14 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer * note: don't call this within a loop since clear_* funcs loop over the entire database. * note: caller must do DAG_relations_tag_update(bmain); * this is not done automatic since we may duplicate many objects in a batch */ -Base *ED_object_add_duplicate(Main *bmain, Scene *scene, ViewLayer *sl, Base *base, int dupflag) +Base *ED_object_add_duplicate(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, int dupflag) { Base *basen; Object *ob; clear_sca_new_poins(); /* BGE logic */ - basen = object_add_duplicate_internal(bmain, scene, sl, base->object, dupflag); + basen = object_add_duplicate_internal(bmain, scene, view_layer, base->object, dupflag); if (basen == NULL) { return NULL; } @@ -2353,7 +2353,7 @@ static int duplicate_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - ViewLayer *sl = CTX_data_view_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); const bool linked = RNA_boolean_get(op->ptr, "linked"); int dupflag = (linked) ? 0 : U.dupflag; @@ -2361,7 +2361,7 @@ static int duplicate_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN (C, Base *, base, selected_bases) { - Base *basen = object_add_duplicate_internal(bmain, scene, sl, base->object, dupflag); + Base *basen = object_add_duplicate_internal(bmain, scene, view_layer, base->object, dupflag); /* note that this is safe to do with this context iterator, * the list is made in advance */ @@ -2373,7 +2373,7 @@ static int duplicate_exec(bContext *C, wmOperator *op) } /* new object becomes active */ - if (BASACT(sl) == base) + if (BASACT(view_layer) == base) ED_object_base_activate(C, basen); if (basen->object->data) { @@ -2425,7 +2425,7 @@ static int add_named_exec(bContext *C, wmOperator *op) const wmEvent *event = win ? win->eventstate : NULL; Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - ViewLayer *sl = CTX_data_view_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Base *basen; Object *ob; const bool linked = RNA_boolean_get(op->ptr, "linked"); @@ -2444,7 +2444,7 @@ static int add_named_exec(bContext *C, wmOperator *op) /* prepare dupli */ clear_sca_new_poins(); /* BGE logic */ - basen = object_add_duplicate_internal(bmain, scene, sl, ob, dupflag); + basen = object_add_duplicate_internal(bmain, scene, view_layer, ob, dupflag); BKE_scene_object_base_flag_sync_from_object(basen); if (basen == NULL) { |