diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-07 13:36:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-07 13:36:06 +0300 |
| commit | 12770dba0e9d5d3dd4b657cc9fa269add5ee18a1 (patch) | |
| tree | f7cd3dcbc3d335062d786e28ead1ef71b4268c70 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 89baa67a4023105dfad982c3f7616b731b2fb26a (diff) | |
use RV3D_CAMOB define, theres no reason to use >= comparison either.
also fixed opengl render ortho test.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 7d30c404bf0..5c95a6a3026 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -1238,7 +1238,7 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob 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 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob } 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 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob 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]); |