[Bf-blender-cvs] [487cd7237c9] master: DRW: check exact draw flags before getting wire-frame color
Campbell Barton
noreply at git.blender.org
Mon Aug 26 17:50:02 CEST 2019
Commit: 487cd7237c9d208cd2b9fa11f49a83ba46a97399
Author: Campbell Barton
Date: Mon Aug 26 22:27:26 2019 +1000
Branches: master
https://developer.blender.org/rB487cd7237c9d208cd2b9fa11f49a83ba46a97399
DRW: check exact draw flags before getting wire-frame color
Only some options need this.
===================================================================
M source/blender/draw/modes/object_mode.c
===================================================================
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 06e5b521514..54e915dbe64 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -3685,7 +3685,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
DRW_shgroup_relationship_lines(sgl, draw_ctx->depsgraph, scene, ob);
}
- const bool draw_extra = (ob->dtx != 0);
+ const bool draw_extra = ob->dtx & (OB_DRAWNAME | OB_TEXSPACE | OB_DRAWBOUNDOX);
if (draw_extra && (theme_id == TH_UNDEFINED)) {
theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
}
More information about the Bf-blender-cvs
mailing list