[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33185] trunk/blender/source/blender/ editors/space_view3d: bugfix [#24812] Cannot change top/left/ front views in quad view after camera change

[Campbell Barton]

Revision: 33185
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33185
Author:   campbellbarton
Date:     2010-11-19 18:16:25 +0100 (Fri, 19 Nov 2010)

Log Message:
-----------
bugfix [#24812] Cannot change top/left/front views in quad view after camera change

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
    trunk/blender/source/blender/editors/space_view3d/view3d_view.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2010-11-19 16:19:15 UTC (rev 33184)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2010-11-19 17:16:25 UTC (rev 33185)
@@ -2030,6 +2030,14 @@
 
 	return OPERATOR_FINISHED;
 }
+
+int region3d_unlocked_poll(bContext *C)
+{
+	RegionView3D *rv3d= CTX_wm_region_view3d(C);
+	return (rv3d && rv3d->viewlock==0);
+}
+
+
 void VIEW3D_OT_viewnumpad(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -2039,7 +2047,7 @@
 
 	/* api callbacks */
 	ot->exec= viewnumpad_exec;
-	ot->poll= ED_operator_region_view3d_active;
+	ot->poll= region3d_unlocked_poll;
 
 	/* flags */
 	ot->flag= 0;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_intern.h	2010-11-19 16:19:15 UTC (rev 33184)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_intern.h	2010-11-19 17:16:25 UTC (rev 33185)
@@ -91,6 +91,7 @@
 
 void view3d_boxview_copy(ScrArea *sa, ARegion *ar);
 void view3d_persp_mat4(struct RegionView3D *rv3d, float mat[][4]);
+int region3d_unlocked_poll(struct bContext *C);
 
 /* view3d_fly.c */
 void view3d_keymap(struct wmKeyConfig *keyconf);

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-11-19 16:19:15 UTC (rev 33184)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-11-19 17:16:25 UTC (rev 33185)
@@ -479,7 +479,7 @@
 	
 	/* api callbacks */
 	ot->exec= view3d_setobjectascamera_exec;	
-	ot->poll= ED_operator_region_view3d_active;
+	ot->poll= region3d_unlocked_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;