Fixed support for building without collada (scons and cmake). Only tested scons.
[blender.git] / source / blender / windowmanager / intern / wm_operators.c
index b0fdbe2a4e14e75b6a3643d91897643bb8c9bd4b..376a98e208878a525ce0810778c9771125eac812 100644 (file)
@@ -1294,10 +1294,9 @@ static void WM_OT_save_mainfile(wmOperatorType *ot)
 }
 
 
+/* XXX: move these collada operators to a more appropriate place */
+#ifdef WITH_COLLADA
 
-
-
-/* XXX: move these to a more appropriate place */
 #include "../../collada/collada.h"
 
 static int wm_collada_export_invoke(bContext *C, wmOperator *op, wmEvent *event)
@@ -1392,7 +1391,7 @@ static void WM_OT_collada_import(wmOperatorType *ot)
        RNA_def_property(ot->srna, "filename", PROP_STRING, PROP_FILEPATH);
 }
 
-
+#endif
 
 
 
@@ -2284,9 +2283,12 @@ void wm_operatortype_init(void)
        WM_operatortype_append(WM_OT_debug_menu);
        WM_operatortype_append(WM_OT_search_menu);
 
+#ifdef WITH_COLLADA
        /* XXX: move these */
        WM_operatortype_append(WM_OT_collada_export);
        WM_operatortype_append(WM_OT_collada_import);
+#endif
+
        WM_operatortype_append(WM_OT_call_menu);
 }