[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27591] branches/render25/source/blender/ editors/space_view3d: minor changes to 'Render Only' option.

[Campbell Barton]

Revision: 27591
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27591
Author:   campbellbarton
Date:     2010-03-18 10:30:34 +0100 (Thu, 18 Mar 2010)

Log Message:
-----------
minor changes to 'Render Only' option.
- display camera border.
- display camera object when in camera view.

Modified Paths:
--------------
    branches/render25/source/blender/editors/space_view3d/drawobject.c
    branches/render25/source/blender/editors/space_view3d/view3d_draw.c

Modified: branches/render25/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/render25/source/blender/editors/space_view3d/drawobject.c	2010-03-18 09:15:07 UTC (rev 27590)
+++ branches/render25/source/blender/editors/space_view3d/drawobject.c	2010-03-18 09:30:34 UTC (rev 27591)
@@ -5804,7 +5804,7 @@
 			}
 			break;
 		case OB_CAMERA:
-			if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+			if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0 || (rv3d->persp==RV3D_CAMOB && v3d->camera==ob)) /* special exception for active camera */
 				drawcamera(scene, v3d, rv3d, ob, flag);
 			break;
 		case OB_LATTICE:

Modified: branches/render25/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- branches/render25/source/blender/editors/space_view3d/view3d_draw.c	2010-03-18 09:15:07 UTC (rev 27590)
+++ branches/render25/source/blender/editors/space_view3d/view3d_draw.c	2010-03-18 09:30:34 UTC (rev 27591)
@@ -2353,11 +2353,11 @@
 	
 	/* Draw particle edit brush XXX (removed) */
 	
-	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
 
-		if(rv3d->persp==RV3D_CAMOB) drawviewborder(scene, ar, v3d);
-		if(rv3d->rflag & RV3D_FLYMODE) drawviewborder_flymode(ar);
+	if(rv3d->persp==RV3D_CAMOB) drawviewborder(scene, ar, v3d);
+	if(rv3d->rflag & RV3D_FLYMODE) drawviewborder_flymode(ar);
 
+	if ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
 		/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
 	//	if (v3d->flag2 & V3D_DISPGP)
 			draw_gpencil_3dview((bContext *)C, 0);