[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33652] trunk/blender/source/blender/ editors/space_view3d/drawarmature.c: [#25211] Impossible to select an armature with shapes

[Campbell Barton]

Revision: 33652
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33652
Author:   campbellbarton
Date:     2010-12-14 07:20:28 +0100 (Tue, 14 Dec 2010)

Log Message:
-----------
[#25211] Impossible to select an armature with shapes
broke since 2.49b, highly confusing function.
Stick bones dont draw solid so cant run glLoadName() in this case.

Tested pose/object mode with all armature draw types and view draw modes.

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	2010-12-14 04:45:29 UTC (rev 33651)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c	2010-12-14 06:20:28 UTC (rev 33652)
@@ -1753,8 +1753,8 @@
 			if (index != -1) 
 				index+= 0x10000;	// pose bones count in higher 2 bytes only
 		}
-		
-		if (draw_wire) {
+		/* stick bones have not been drawn yet so dont clear object selection in this case */
+		if ((arm->drawtype != ARM_LINE) && draw_wire) {
 			/* object tag, for bordersel optim */
 			glLoadName(index & 0xFFFF);	
 			index= -1;