[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26447] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: [#20320] Quad View - Orthogonal grid changes to perspective grid

[Campbell Barton]

Revision: 26447
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26447
Author:   campbellbarton
Date:     2010-01-30 19:54:36 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
[#20320] Quad View - Orthogonal grid changes to perspective grid
- respect view locking (dont change rv3d->view)
- on multiple calls to smoothview, get the original view from the previously called smoothview if it exists.

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-01-30 18:53:33 UTC (rev 26446)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-01-30 18:54:36 UTC (rev 26447)
@@ -282,9 +282,12 @@
 				sms.orig_lens= v3d->lens;
 			}
 			/* grid draw as floor */
-			sms.orig_view= rv3d->view;
-			rv3d->view= 0;
-			
+			if((rv3d->viewlock & RV3D_LOCKED)==0) {
+				/* use existing if exists, means multiple calls to smooth view wont loose the original 'view' setting */
+				sms.orig_view= rv3d->sms ? rv3d->sms->orig_view : rv3d->view;
+				rv3d->view= 0;
+			}
+
 			/* ensure it shows correct */
 			if(sms.to_camera) rv3d->persp= RV3D_PERSP;
 
@@ -344,8 +347,11 @@
 			rv3d->dist = sms->new_dist;
 			v3d->lens = sms->new_lens;
 		}
-		rv3d->view= sms->orig_view;
 		
+		if((rv3d->viewlock & RV3D_LOCKED)==0) {
+			rv3d->view= sms->orig_view;
+		}
+
 		MEM_freeN(rv3d->sms);
 		rv3d->sms= NULL;