[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47573] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: fix for crash with recent color commits to draw-object, this case wasnt handled correctly before.

[Campbell Barton]

Revision: 47573
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47573
Author:   campbellbarton
Date:     2012-06-07 15:20:51 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
fix for crash with recent color commits to draw-object, this case wasnt handled correctly before.

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 14:22:40 UTC (rev 47572)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-06-07 15:20:51 UTC (rev 47573)
@@ -1774,9 +1774,16 @@
 
 #ifdef VIEW3D_CAMERA_BORDER_HACK
 	if (is_view && !(G.f & G_PICKSEL)) {
-		view3d_camera_border_hack_col[0] = ob_wire_col[0];
-		view3d_camera_border_hack_col[1] = ob_wire_col[1];
-		view3d_camera_border_hack_col[2] = ob_wire_col[2];
+		if ((flag & DRAW_CONSTCOLOR) == 0) {
+			view3d_camera_border_hack_col[0] = ob_wire_col[0];
+			view3d_camera_border_hack_col[1] = ob_wire_col[1];
+			view3d_camera_border_hack_col[2] = ob_wire_col[2];
+		}
+		else {
+			float col[4];
+			glGetFloatv(GL_CURRENT_COLOR, col);
+			rgb_float_to_uchar(view3d_camera_border_hack_col, col);
+		}
 		view3d_camera_border_hack_test = TRUE;
 		return;
 	}