Merged changes in the trunk up to revision 26439.
[blender.git] / source / blender / editors / space_view3d / view3d_edit.c
index ad061532045f696c71d03cef7a3a40d45d852053..6685386c36c3d0da1d60122e3f544f0733fe5422 100644 (file)
@@ -772,7 +772,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;
@@ -2011,7 +2011,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;