[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47571] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: fix for crash with selecting camera bundles.

[Campbell Barton]

Revision: 47571
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47571
Author:   campbellbarton
Date:     2012-06-07 14:21:25 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
fix for crash with selecting camera bundles.

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

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-06-07 13:18:22 UTC (rev 47570)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-06-07 14:21:25 UTC (rev 47571)
@@ -1744,7 +1744,9 @@
 	glDisable(GL_COLOR_MATERIAL);
 	glDisable(GL_LIGHTING);
 
-	glColor3ubv(ob_wire_col);
+	if ((flag & DRAW_CONSTCOLOR) == 0) {
+		glColor3ubv(ob_wire_col);
+	}
 
 	if (flag & DRAW_PICKING)
 		glLoadName(base->selcol);