diff options
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/object/object_select.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index e9bea64b56c..c376b0cf78f 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -894,7 +894,7 @@ static void copy_texture_space(Object *to, Object *ob) } /* UNUSED, keep in case we want to copy functionality for use elsewhere */ -static void copy_attr(Main *bmain, Scene *scene, ViewLayer *view_layer, short event) +static void copy_attr(Main *bmain, Scene *scene, ViewLayer *view_layer, View3D *v3d, short event) { Object *ob; Base *base; @@ -918,7 +918,7 @@ static void copy_attr(Main *bmain, Scene *scene, ViewLayer *view_layer, short ev for (base = FIRSTBASE(view_layer); base; base = base->next) { if (base != BASACT(view_layer)) { - if (TESTBASELIB(base)) { + if (TESTBASELIB(v3d, base)) { DEG_id_tag_update(&base->object->id, OB_RECALC_DATA); if (event == 1) { /* loc */ @@ -1111,7 +1111,7 @@ static void copy_attr(Main *bmain, Scene *scene, ViewLayer *view_layer, short ev } } -static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, ViewLayer *view_layer, Object *obedit) +static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, ViewLayer *view_layer, View3D *v3d, Object *obedit) { Object *ob; short event; @@ -1165,7 +1165,7 @@ static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, ViewLaye event = pupmenu(str); if (event <= 0) return; - copy_attr(bmain, scene, view_layer, event); + copy_attr(bmain, scene, view_layer, v3d, event); } /* ******************* force field toggle operator ***************** */ diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 1e69916d865..10e9b58b38b 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -755,6 +755,7 @@ static bool select_grouped_children(bContext *C, Object *ob, const bool recursiv static bool select_grouped_parent(bContext *C) /* Makes parent active and de-selected OBACT */ { ViewLayer *view_layer = CTX_data_view_layer(C); + View3D *v3d = CTX_wm_view3d(C); Base *baspar, *basact = CTX_data_active_base(C); bool changed = false; @@ -765,7 +766,7 @@ static bool select_grouped_parent(bContext *C) /* Makes parent active and de-sel baspar = BKE_view_layer_base_find(view_layer, basact->object->parent); /* can be NULL if parent in other scene */ - if (baspar && BASE_SELECTABLE(baspar)) { + if (baspar && BASE_SELECTABLE(v3d, baspar)) { ED_object_base_select(baspar, BA_SELECT); ED_object_base_activate(C, baspar); changed = true; @@ -823,6 +824,7 @@ static bool select_grouped_collection(bContext *C, Object *ob) /* Select object static bool select_grouped_object_hooks(bContext *C, Object *ob) { ViewLayer *view_layer = CTX_data_view_layer(C); + View3D *v3d = CTX_wm_view3d(C); bool changed = false; Base *base; @@ -834,7 +836,7 @@ static bool select_grouped_object_hooks(bContext *C, Object *ob) hmd = (HookModifierData *) md; if (hmd->object) { base = BKE_view_layer_base_find(view_layer, hmd->object); - if (base && ((base->flag & BASE_SELECTED) == 0) && (BASE_SELECTABLE(base))) { + if (base && ((base->flag & BASE_SELECTED) == 0) && (BASE_SELECTABLE(v3d, base))) { ED_object_base_select(base, BA_SELECT); changed = true; } |