Merged changes in the trunk up to revision 26260.
[blender-staging.git] / source / blender / editors / space_view3d / view3d_edit.c
index a3a464041a7d52c99589a09e93bdfa58a2f13b66..a4d460ecbadb892a8cf2d8535f0bf9716e522488 100644 (file)
@@ -742,7 +742,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;
@@ -1977,7 +1977,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;