[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32735] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: fix for shift offset in own recent commit for drawing the camera border in camera view .

[Campbell Barton]

Revision: 32735
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32735
Author:   campbellbarton
Date:     2010-10-27 13:05:46 +0200 (Wed, 27 Oct 2010)

Log Message:
-----------
fix for shift offset in own recent commit for drawing the camera border in camera view.

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-10-27 10:45:36 UTC (rev 32734)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-10-27 11:05:46 UTC (rev 32735)
@@ -1022,9 +1022,15 @@
 			float dx= 0.5*fac*rv3d->camdx*(x2-x1);
 			float dy= 0.5*fac*rv3d->camdy*(y2-y1);
 
-			/* shify offset */			
-			dx += ((cam->shiftx/10.0f) / cam->lens) * 32.0;
-			dy += ((cam->shifty/10.0f) / cam->lens) * 32.0;
+			/* shift offset */		
+			if(cam->type==CAM_ORTHO) {
+				dx += cam->shiftx * cam->ortho_scale;
+				dy += cam->shifty * cam->ortho_scale;
+			}
+			else {
+				dx += cam->shiftx * (cam->clipsta / cam->lens) * 32.0;
+				dy += cam->shifty * (cam->clipsta / cam->lens) * 32.0;
+			}
 
 			x1+= dx;
 			x2+= dx;