[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41254] branches/soc-2011-onion-uv-tools: file that escaped the merge

[Antony Riakiotakis]

Revision: 41254
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41254
Author:   psy-fi
Date:     2011-10-24 15:55:10 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
file that escaped the merge

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawarmature.c

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39665-41109,41115-41225
   + /trunk/blender:39665-41226

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawarmature.c	2011-10-24 15:44:30 UTC (rev 41253)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawarmature.c	2011-10-24 15:55:10 UTC (rev 41254)
@@ -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);