[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47529] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: fix for error in previous commit.

[Campbell Barton]

Revision: 47529
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47529
Author:   campbellbarton
Date:     2012-06-06 18:07:06 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
fix for error in previous commit.

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-06 18:00:08 UTC (rev 47528)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-06-06 18:07:06 UTC (rev 47529)
@@ -6292,7 +6292,8 @@
 }
 
 /* draws wire outline */
-static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
+static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
+                             const unsigned char ob_wire_col[4])
 {
 	RegionView3D *rv3d = ar->regiondata;
 	Object *ob = base->object;
@@ -6331,7 +6332,7 @@
 	}
 	else if (ob->type == OB_ARMATURE) {
 		if (!(ob->mode & OB_MODE_POSE && base == scene->basact))
-			draw_armature(scene, v3d, ar, base, OB_WIRE, FALSE, NULL, TRUE);
+			draw_armature(scene, v3d, ar, base, OB_WIRE, FALSE, ob_wire_col, TRUE);
 	}
 
 	glLineWidth(1.0);
@@ -6666,7 +6667,7 @@
 		if (dt > OB_WIRE && (ob->mode & OB_MODE_EDIT) == 0 && (flag & DRAW_SCENESET) == 0) {
 			if (!(ob->dtx & OB_DRAWWIRE) && (ob->flag & SELECT) && !(flag & DRAW_PICKING)) {
 				
-				drawObjectSelect(scene, v3d, ar, base);
+				drawObjectSelect(scene, v3d, ar, base, ob_wire_col);
 			}
 		}
 	}