Collada: fix for building without collada
authorGaia Clary <gaia.clary@machinimatrix.org>
Mon, 18 Jun 2012 00:27:30 +0000 (00:27 +0000)
committerGaia Clary <gaia.clary@machinimatrix.org>
Mon, 18 Jun 2012 00:27:30 +0000 (00:27 +0000)
source/blender/editors/io/CMakeLists.txt
source/blender/editors/io/io_collada.c
source/blender/editors/io/io_ops.c

index 49aec60..ceefb7f 100755 (executable)
@@ -39,4 +39,8 @@ set(SRC
     io_ops.h
 )
 
+if(WITH_OPENCOLLADA)
+       add_definitions(-DWITH_COLLADA)
+endif()
+
 blender_add_lib(bf_editor_io "${SRC}" "${INC}" "${INC_SYS}")
index 699b89f..fcdd60a 100644 (file)
@@ -27,7 +27,7 @@
 /** \file blender/editors/io/collada.c
  *  \ingroup collada
  */
-
+#ifdef WITH_COLLADA
 #include "DNA_scene_types.h"
 
 #include "BLF_translation.h"
@@ -277,4 +277,5 @@ void WM_OT_collada_import(wmOperatorType *ot)
        ot->poll = WM_operator_winactive;
        
        WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
index ed9b134..a06d54c 100755 (executable)
  *  \ingroup collada
  */
 
+
 #include "io_collada.h"
 
 void ED_operatortypes_io(void) 
 {
+#ifdef WITH_COLLADA
        // Collada operators:
        WM_operatortype_append(WM_OT_collada_export);
        WM_operatortype_append(WM_OT_collada_import);
+#endif
 }