COLLADA branch: merge from trunk -r 24522:24758.
[blender-staging.git] / source / blender / windowmanager / intern / wm_operators.c
index beece8c9226c62766156c4912e7c2c8c1ed92c44..a68a4b8414e68aad82c8627b7c7f8affc2666665 100644 (file)
@@ -745,6 +745,7 @@ int WM_operator_redo_popup(bContext *C, wmOperator *op)
        return OPERATOR_CANCELLED;
 }
 
+
 /* ***************** Debug menu ************************* */
 
 static uiBlock *wm_block_create_menu(bContext *C, ARegion *ar, void *arg_op)
@@ -2303,6 +2304,7 @@ void WM_OT_radial_control_partial(wmOperatorType *ot)
        RNA_def_int_vector(ot->srna, "initial_mouse", 2, NULL, INT_MIN, INT_MAX, "initial_mouse", "", INT_MIN, INT_MAX);
 }
 
+
 /* ************************** timer for testing ***************** */
 
 /* uses no type defines, fully local testing function anyway... ;) */
@@ -2466,7 +2468,6 @@ void wm_operatortype_init(void)
        WM_operatortype_append(WM_OT_memory_statistics);
        WM_operatortype_append(WM_OT_debug_menu);
        WM_operatortype_append(WM_OT_search_menu);
-       WM_operatortype_append(WM_OT_call_menu);
 
 #ifdef WITH_COLLADA
        /* XXX: move these */
@@ -2474,6 +2475,7 @@ void wm_operatortype_init(void)
        WM_operatortype_append(WM_OT_collada_import);
 #endif
 
+       WM_operatortype_append(WM_OT_call_menu);
 }
 
 /* called in transform_ops.c, on each regeneration of keymaps  */