COLLADA: merge from trunk -r 24390:24522.
[blender.git] / source / blender / windowmanager / intern / wm_operators.c
index f8febdcd8989a3b993ef81705679728d241eb3e9..1f8e2e280241c328faa6918851785553840c1b38 100644 (file)
@@ -656,6 +656,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)
@@ -2214,6 +2215,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... ;) */
@@ -2377,7 +2379,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 */
@@ -2385,6 +2386,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  */