[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26036] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: bugix [#20687] Selection code on duplis gets incorrect draw mode flag

[Campbell Barton]

Revision: 26036
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26036
Author:   campbellbarton
Date:     2010-01-16 16:17:40 +0100 (Sat, 16 Jan 2010)

Log Message:
-----------
bugix [#20687] Selection code on duplis gets incorrect draw mode flag
could make selection very slow in some cases

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

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-01-16 14:31:21 UTC (rev 26035)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-01-16 15:17:40 UTC (rev 26036)
@@ -1199,6 +1199,7 @@
 	ARegion *ar= vc->ar;
 	rctf rect;
 	short code, hits;
+	char dt, dtx;
 	
 	G.f |= G_PICKSEL;
 	
@@ -1269,8 +1270,16 @@
 							tbase.object= dob->ob;
 							copy_m4_m4(dob->ob->obmat, dob->mat);
 							
+							/* extra service: draw the duplicator in drawtype of parent */
+							/* MIN2 for the drawtype to allow bounding box objects in groups for lods */
+							dt= tbase.object->dt;	tbase.object->dt= MIN2(tbase.object->dt, base->object->dt);
+							dtx= tbase.object->dtx; tbase.object->dtx= base->object->dtx;
+
 							draw_object(scene, ar, v3d, &tbase, DRAW_PICKING|DRAW_CONSTCOLOR);
 							
+							tbase.object->dt= dt;
+							tbase.object->dtx= dtx;
+
 							copy_m4_m4(dob->ob->obmat, dob->omat);
 						}
 						free_object_duplilist(lb);