[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41113] trunk/blender/source/blender/ editors/space_view3d/drawarmature.c: fix for armatures in wire draw mode not displaying in solid mode.

Campbell Barton ideasman42 at gmail.com
Wed Oct 19 02:41:49 CEST 2011


Revision: 41113
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41113
Author:   campbellbarton
Date:     2011-10-19 00:41:48 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
fix for armatures in wire draw mode not displaying in solid mode.

note, this isn't a showstopper bugfix.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawarmature.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c	2011-10-19 00:13:41 UTC (rev 41112)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c	2011-10-19 00:41:48 UTC (rev 41113)
@@ -1839,7 +1839,7 @@
 	}
 	
 	/* wire draw over solid only in posemode */
-	if ((dt <= OB_WIRE) || (arm->flag & ARM_POSEMODE) || (arm->drawtype==ARM_LINE)) {
+	if ((dt <= OB_WIRE) || (arm->flag & ARM_POSEMODE) || ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) {
 		/* draw line check first. we do selection indices */
 		if ELEM(arm->drawtype, ARM_LINE, ARM_WIRE) {
 			if (arm->flag & ARM_POSEMODE) 
@@ -2512,7 +2512,7 @@
 	if(v3d->flag2 & V3D_RENDER_OVERRIDE)
 		return 1;
 	
-	if(dt>OB_WIRE && arm->drawtype!=ARM_LINE) {
+	if(dt>OB_WIRE && !ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) {
 		/* we use color for solid lighting */
 		glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR);
 		glEnable(GL_COLOR_MATERIAL);




More information about the Bf-blender-cvs mailing list