[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47562] trunk/blender/source/blender/ editors/space_view3d/drawarmature.c: dont draw bone names/ axis inside duplicators

[Campbell Barton]

Revision: 47562
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47562
Author:   campbellbarton
Date:     2012-06-07 08:20:10 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
dont draw bone names/axis inside duplicators

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	2012-06-07 08:16:41 UTC (rev 47561)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c	2012-06-07 08:20:10 UTC (rev 47562)
@@ -1985,11 +1985,17 @@
 	glDisable(GL_CULL_FACE);
 	
 	/* draw DoFs */
-	if (arm->flag & ARM_POSEMODE)
-		draw_pose_dofs(ob);
+	if (arm->flag & ARM_POSEMODE) {
+		if (((base->flag & OB_FROMDUPLI) == 0)) {
+			draw_pose_dofs(ob);
+		}
+	}
 
 	/* finally names and axes */
-	if ((arm->flag & (ARM_DRAWNAMES | ARM_DRAWAXES)) && (is_outline == 0)) {
+	if ((arm->flag & (ARM_DRAWNAMES | ARM_DRAWAXES)) &&
+	    (is_outline == 0) &&
+	    ((base->flag & OB_FROMDUPLI) == 0))
+	{
 		/* patch for several 3d cards (IBM mostly) that crash on GL_SELECT with text drawing */
 		if ((G.f & G_PICKSEL) == 0) {
 			float vec[3];