[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32913] trunk/blender/source/blender/ editors: use RV3D_CAMOB define, theres no reason to use >= comparison either.

[Campbell Barton]

Revision: 32913
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32913
Author:   campbellbarton
Date:     2010-11-07 11:36:06 +0100 (Sun, 07 Nov 2010)

Log Message:
-----------
use RV3D_CAMOB define, theres no reason to use >= comparison either.
also fixed opengl render ortho test.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_opengl.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c	2010-11-07 10:22:34 UTC (rev 32912)
+++ trunk/blender/source/blender/editors/render/render_opengl.c	2010-11-07 10:36:06 UTC (rev 32913)
@@ -134,7 +134,7 @@
 		/* render 3d view */
 		if(rv3d->persp==RV3D_CAMOB && v3d->camera) {
 			RE_GetCameraWindow(oglrender->re, v3d->camera, scene->r.cfra, winmat);
-			is_ortho= scene->r.mode * R_ORTHO;
+			is_ortho= scene->r.mode & R_ORTHO;
 			
 		}
 		else {

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-11-07 10:22:34 UTC (rev 32912)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-11-07 10:36:06 UTC (rev 32913)
@@ -1238,7 +1238,7 @@
 	glDisable(GL_LIGHTING);
 	glDisable(GL_CULL_FACE);
 	
-	if(rv3d->persp>=2 && cam->type==CAM_ORTHO && ob==v3d->camera) {
+	if(rv3d->persp==RV3D_CAMOB && cam->type==CAM_ORTHO && ob==v3d->camera) {
 		facx= 0.5*cam->ortho_scale*caspx;
 		facy= 0.5*cam->ortho_scale*caspy;
 		shx= cam->shiftx * cam->ortho_scale;
@@ -1247,7 +1247,7 @@
 	}
 	else {
 		fac= cam->drawsize;
-		if(rv3d->persp>=2 && ob==v3d->camera) fac= cam->clipsta+0.1; /* that way it's always visible */
+		if(rv3d->persp==RV3D_CAMOB && ob==v3d->camera) fac= cam->clipsta+0.1; /* that way it's always visible */
 		
 		depth= - fac*cam->lens/16.0;
 		facx= fac*caspx;
@@ -1270,7 +1270,7 @@
 	glEnd();
 	
 
-	if(rv3d->persp>=2 && ob==v3d->camera) return;
+	if(rv3d->persp==RV3D_CAMOB && ob==v3d->camera) return;
 	
 	glBegin(GL_LINE_STRIP);
 		glVertex3fv(vec[2]);