diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-21 05:06:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-21 05:07:36 +0300 |
commit | 67c3791f63c03e205e2c4683988f8127f3a476e0 (patch) | |
tree | 8f4d543dadd81f5db6dd74b7ab0486bd263b7f37 /source/blender | |
parent | 18593c7cd3ff3f63cec7115a5c8e0d8e51a7b784 (diff) |
Object: minor changes to jump-to API
- Always select the jump-to object, even if it's active.
- Remove check for invalid object data
(these cases will fail much earlier).
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/object/object_select.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 5873c972cae..1e69916d865 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -266,7 +266,7 @@ bool ED_object_jump_to_object( /* TODO, use 'reveal_hidden', as is done with bones. */ - if (view_layer->basact != base) { + if (view_layer->basact != base || !(base->flag & BASE_SELECTED)) { /* Select if not selected. */ if (!(base->flag & BASE_SELECTED)) { ED_object_base_deselect_all(view_layer, SEL_DESELECT); @@ -303,10 +303,6 @@ bool ED_object_jump_to_bone( bArmature *arm = ob->data; - if (arm == NULL || GS(arm->id.name) != ID_AR) { - return false; - } - /* Activate the armature object. */ if (!ED_object_jump_to_object(C, ob, reveal_hidden)) { return false; |