[Bf-blender-cvs] [f55ca54] master: Object drawing: test the flag, without comparing the value
Campbell Barton
noreply at git.blender.org
Mon Apr 21 11:29:58 CEST 2014
Commit: f55ca54be18199a968bbb9623d8e5d323a55f7ba
Author: Campbell Barton
Date: Mon Apr 21 19:26:37 2014 +1000
https://developer.blender.org/rBf55ca54be18199a968bbb9623d8e5d323a55f7ba
Object drawing: test the flag, without comparing the value
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 6ca67aa..dc1d762 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -6972,7 +6972,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
switch (ob->type) {
case OB_MESH:
empty_object = draw_mesh_object(scene, ar, v3d, rv3d, base, dt, ob_wire_col, dflag);
- if (dflag != DRAW_CONSTCOLOR) dtx &= ~OB_DRAWWIRE; // mesh draws wire itself
+ if ((dflag & DRAW_CONSTCOLOR) == 0) {
+ /* mesh draws wire itself */
+ dtx &= ~OB_DRAWWIRE;
+ }
break;
case OB_FONT:
More information about the Bf-blender-cvs
mailing list