Merged changes in the trunk up to revision 28685.
[blender.git] / source / blender / editors / space_view3d / view3d_edit.c
index 3d039f07a65cbb15b1a6d01710319e113757dff0..02f7c8c3a78a7714d3cd2ed845785131ae1c2a92 100644 (file)
@@ -747,7 +747,7 @@ void VIEW3D_OT_rotate(wmOperatorType *ot)
        /* api callbacks */
        ot->invoke= viewrotate_invoke;
        ot->modal= viewrotate_modal;
-       ot->poll= ED_operator_view3d_rotate;
+       ot->poll= ED_operator_view3d_active;
 
        /* flags */
        ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER;
@@ -1993,7 +1993,7 @@ void VIEW3D_OT_view_orbit(wmOperatorType *ot)
 
        /* api callbacks */
        ot->exec= vieworbit_exec;
-       ot->poll= ED_operator_view3d_rotate;
+       ot->poll= ED_operator_view3d_active;
 
        /* flags */
        ot->flag= 0;