[Bf-blender-cvs] [f71ae309626] blender2.8: Fix edit-mode wire color being used for other objects

Campbell Barton noreply at git.blender.org
Tue Dec 18 11:22:20 CET 2018


Commit: f71ae30962651eaf538600584af1c004b4251847
Author: Campbell Barton
Date:   Tue Dec 18 21:20:04 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBf71ae30962651eaf538600584af1c004b4251847

Fix edit-mode wire color being used for other objects

===================================================================

M	source/blender/draw/intern/draw_common.c

===================================================================

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.



More information about the Bf-blender-cvs mailing list