diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-18 13:20:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-18 13:21:48 +0300 |
| commit | f71ae30962651eaf538600584af1c004b4251847 (patch) | |
| tree | bc70bc2d474553aaeacc5c84afdab32c067bc4af /source | |
| parent | d3e1b043c37398ac1e1027a6004239dee8a055f0 (diff) | |
Fix edit-mode wire color being used for other objects
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 837b6e5d051..36a50dec85e 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -870,7 +870,7 @@ struct GPUShader *volume_velocity_shader_get(bool use_needle) int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color) { const DRWContextState *draw_ctx = DRW_context_state_get(); - const bool is_edit = (draw_ctx->object_mode & OB_MODE_EDIT) != 0; + const bool is_edit = (draw_ctx->object_mode & OB_MODE_EDIT) && (ob->mode & OB_MODE_EDIT); const bool active = (view_layer->basact && view_layer->basact->object == ob); /* confusing logic here, there are 2 methods of setting the color * 'colortab[colindex]' and 'theme_id', colindex overrides theme_id. |