[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28883] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: missed some boundbox' s drawing when they shouldnt

[Campbell Barton]

Revision: 28883
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28883
Author:   campbellbarton
Date:     2010-05-20 17:04:47 +0200 (Thu, 20 May 2010)

Log Message:
-----------
missed some boundbox's drawing when they shouldnt

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	2010-05-20 12:34:32 UTC (rev 28882)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-05-20 15:04:47 UTC (rev 28883)
@@ -2484,7 +2484,8 @@
 	if (ob==OBACT && paint_facesel_test(ob)) draw_wire = 0;
 
 	if(dt==OB_BOUNDBOX) {
-		draw_bounding_volume(scene, ob);
+		if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_WIRE)==0)
+			draw_bounding_volume(scene, ob);
 	}
 	else if(hasHaloMat || (totface==0 && totedge==0)) {
 		glPointSize(1.5);
@@ -6107,7 +6108,10 @@
 			if(dtx & OB_AXIS) {
 				drawaxes(rv3d, rv3d->viewmatob, 1.0f, flag, OB_ARROWS);
 			}
-			if(dtx & OB_BOUNDBOX) draw_bounding_volume(scene, ob);
+			if(dtx & OB_BOUNDBOX) {
+				if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+					draw_bounding_volume(scene, ob);
+			}
 			if(dtx & OB_TEXSPACE) drawtexspace(ob);
 			if(dtx & OB_DRAWNAME) {
 				/* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */