[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34662] trunk/blender/source/blender/ editors/space_view3d: todo list item:
Ton Roosendaal
ton at blender.org
Sat Feb 5 20:07:55 CET 2011
Revision: 34662
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34662
Author: ton
Date: 2011-02-05 19:07:54 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
todo list item:
3D View:
In quad-view mode, the options to set back/bottom/left views were
blocked. Now they work again.
Note: the oparator polls don't have a check for properties... so it
cannot be finegrained here. Checks are inside code.
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 2011-02-05 17:54:00 UTC (rev 34661)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-02-05 19:07:54 UTC (rev 34662)
@@ -766,7 +766,7 @@
if(rv3d->viewlock) { /* poll should check but in some cases fails, see poll func for details */
viewops_data_free(C, op);
- return OPERATOR_CANCELLED;
+ return OPERATOR_PASS_THROUGH;
}
/* switch from camera view when: */
@@ -828,21 +828,6 @@
return 0;
}
-static int view3d_rotate_poll(bContext *C)
-{
- if (!ED_operator_region_view3d_active(C)) {
- return 0;
- } else {
- RegionView3D *rv3d= CTX_wm_region_view3d(C);
- /* rv3d is null in menus, but it's ok when the menu is clicked on */
- /* XXX of course, this doesn't work with quadview
- * Maybe having exec return PASSTHROUGH would be better than polling here
- * Poll functions are full of problems anyway.
- * */
- return rv3d == NULL || rv3d->viewlock == 0;
- }
-}
-
void VIEW3D_OT_rotate(wmOperatorType *ot)
{
@@ -854,7 +839,7 @@
/* api callbacks */
ot->invoke= viewrotate_invoke;
ot->modal= viewrotate_modal;
- ot->poll= view3d_rotate_poll;
+ ot->poll= ED_operator_region_view3d_active;
/* flags */
ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER;
@@ -1953,6 +1938,9 @@
viewnum = RNA_enum_get(op->ptr, "type");
align_active = RNA_boolean_get(op->ptr, "align_active");
+ /* set this to zero, gets handled in axis_set_view */
+ if(rv3d->viewlock)
+ align_active= 0;
/* Use this to test if we started out with a camera */
@@ -2060,13 +2048,7 @@
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 */
@@ -2076,7 +2058,7 @@
/* api callbacks */
ot->exec= viewnumpad_exec;
- ot->poll= region3d_unlocked_poll;
+ ot->poll= ED_operator_region_view3d_active;
/* flags */
ot->flag= 0;
@@ -2144,7 +2126,7 @@
/* api callbacks */
ot->exec= vieworbit_exec;
- ot->poll= view3d_rotate_poll;
+ ot->poll= ED_operator_region_view3d_active;
/* 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 2011-02-05 17:54:00 UTC (rev 34661)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_intern.h 2011-02-05 19:07:54 UTC (rev 34662)
@@ -85,7 +85,6 @@
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 2011-02-05 17:54:00 UTC (rev 34661)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-02-05 19:07:54 UTC (rev 34662)
@@ -477,6 +477,13 @@
return OPERATOR_FINISHED;
}
+static int region3d_unlocked_poll(bContext *C)
+{
+ RegionView3D *rv3d= CTX_wm_region_view3d(C);
+ return (rv3d && rv3d->viewlock==0);
+}
+
+
void VIEW3D_OT_object_as_camera(wmOperatorType *ot)
{
More information about the Bf-blender-cvs
mailing list