diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-29 15:11:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-29 15:21:18 +0300 |
commit | 8b24f45e6bd9f310260da4fe2a2510042a50665f (patch) | |
tree | 266715bbec35efcc2b6604eb74d0220d59746c7f /source/blender/blenkernel | |
parent | 03b0495d041da3789012d00624d56de2503abec1 (diff) |
Object Modes: only use selection for mode switch
Selection is no longer needed for an object to be considered in a mode.
Part of T55246 design task, fixes T55187
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 9 |
3 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index db6c7aa9c4f..f71a15f511f 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -81,7 +81,6 @@ void BKE_object_copy_proxy_drivers(struct Object *ob, struct Object *target); bool BKE_object_exists_check(const struct Object *obtest); bool BKE_object_is_in_editmode(const struct Object *ob); bool BKE_object_is_in_editmode_vgroup(const struct Object *ob); -bool BKE_object_is_in_editmode_and_selected(const struct Object *ob); bool BKE_object_is_in_wpaint_select_vert(const struct Object *ob); bool BKE_object_has_mode_data(const struct Object *ob, eObjectMode object_mode); diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 3a6d599ccd3..16e349465f6 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1206,8 +1206,7 @@ void BKE_view_layer_bases_in_mode_iterator_next(BLI_Iterator *iter) } while (base) { - if ((base->flag & BASE_SELECTED) != 0 && - (base->object->type == data->base_active->object->type) && + if ((base->object->type == data->base_active->object->type) && (base != data->base_active) && (base->object->mode & data->object_mode)) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index ab3300c4ff7..57324b88912 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -502,15 +502,6 @@ bool BKE_object_is_in_editmode(const Object *ob) return false; } -bool BKE_object_is_in_editmode_and_selected(const Object *ob) -{ - if ((ob->base_flag & BASE_SELECTED) && (BKE_object_is_in_editmode(ob))) { - return true; - } - return false; -} - - bool BKE_object_is_in_editmode_vgroup(const Object *ob) { return (OB_TYPE_SUPPORT_VGROUP(ob->type) && |