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/draw/modes | |
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/draw/modes')
-rw-r--r-- | source/blender/draw/modes/edit_curve_mode.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_lattice_mode.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_metaball_mode.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c index 8e70de5dd9f..50ce29b7b1a 100644 --- a/source/blender/draw/modes/edit_curve_mode.c +++ b/source/blender/draw/modes/edit_curve_mode.c @@ -239,7 +239,7 @@ static void EDIT_CURVE_cache_populate(void *vedata, Object *ob) #if 0 if (ob == draw_ctx->object_edit) #else - if ((ob == draw_ctx->object_edit) || BKE_object_is_in_editmode_and_selected(ob)) + if ((ob == draw_ctx->object_edit) || BKE_object_is_in_editmode(ob)) #endif { Curve *cu = ob->data; diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c index 77e648f1717..870dd14d677 100644 --- a/source/blender/draw/modes/edit_lattice_mode.c +++ b/source/blender/draw/modes/edit_lattice_mode.c @@ -194,7 +194,7 @@ static void EDIT_LATTICE_cache_populate(void *vedata, Object *ob) UNUSED_VARS(psl); if (ob->type == OB_LATTICE) { - if ((ob == draw_ctx->object_edit) || BKE_object_is_in_editmode_and_selected(ob)) { + if ((ob == draw_ctx->object_edit) || BKE_object_is_in_editmode(ob)) { /* Get geometry cache */ struct Gwn_Batch *geom; diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index f6e0267c25e..85a7c4ec528 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -450,7 +450,7 @@ static void EDIT_MESH_cache_populate(void *vedata, Object *ob) struct Gwn_Batch *geom; if (ob->type == OB_MESH) { - if ((ob == draw_ctx->object_edit) || BKE_object_is_in_editmode_and_selected(ob)) { + if ((ob == draw_ctx->object_edit) || BKE_object_is_in_editmode(ob)) { const Mesh *me = ob->data; bool do_occlude_wire = (v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_OCCLUDE_WIRE) != 0; bool do_show_weight = (v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_WEIGHT) != 0; diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c index c0c4e7e4295..20539295fd2 100644 --- a/source/blender/draw/modes/edit_metaball_mode.c +++ b/source/blender/draw/modes/edit_metaball_mode.c @@ -136,7 +136,7 @@ static void EDIT_METABALL_cache_populate(void *vedata, Object *ob) const DRWContextState *draw_ctx = DRW_context_state_get(); DRWShadingGroup *group = stl->g_data->group; - if ((ob == draw_ctx->object_edit) || BKE_object_is_in_editmode_and_selected(ob)) { + if ((ob == draw_ctx->object_edit) || BKE_object_is_in_editmode(ob)) { MetaBall *mb = ob->data; const float *color; |