[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29356] trunk/blender/source/blender/ editors/screen/screen_ops.c: Fix [#22111] Quad View panes have wrong view when switching between Global/Local View

[Matt Ebb]

Revision: 29356
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29356
Author:   broken
Date:     2010-06-09 06:54:10 +0200 (Wed, 09 Jun 2010)

Log Message:
-----------
Fix [#22111] Quad View panes have wrong view when switching between Global/Local View

Joe already committed this to render branch in r28545, but it's not in trunk. 
The code that was committed doesn't seem to work properly, either, needs braces.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2010-06-09 04:35:35 UTC (rev 29355)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-06-09 04:54:10 UTC (rev 29356)
@@ -2172,18 +2172,22 @@
 			
 			rv3d= ar->regiondata;
 			rv3d->viewlock= RV3D_LOCKED; rv3d->view= RV3D_VIEW_FRONT; rv3d->persp= RV3D_ORTHO;
+			if (rv3d->localvd) { rv3d->localvd->view = rv3d->view; rv3d->localvd->persp = rv3d->persp; }
 			
 			ar= ar->next;
 			rv3d= ar->regiondata;
 			rv3d->viewlock= RV3D_LOCKED; rv3d->view= RV3D_VIEW_TOP; rv3d->persp= RV3D_ORTHO;
+			if (rv3d->localvd) { rv3d->localvd->view = rv3d->view; rv3d->localvd->persp = rv3d->persp; }
 			
 			ar= ar->next;
 			rv3d= ar->regiondata;
 			rv3d->viewlock= RV3D_LOCKED; rv3d->view= RV3D_VIEW_RIGHT; rv3d->persp= RV3D_ORTHO;
+			if (rv3d->localvd) { rv3d->localvd->view = rv3d->view; rv3d->localvd->persp = rv3d->persp; }
 			
 			ar= ar->next;
 			rv3d= ar->regiondata;
 			rv3d->view= RV3D_VIEW_CAMERA; rv3d->persp= RV3D_CAMOB;
+			if (rv3d->localvd) {rv3d->localvd->view = rv3d->view; rv3d->localvd->persp = rv3d->persp; }
 		}
 		
 #ifdef WM_FAST_DRAW