[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48019] trunk/blender/source/blender/ editors/io: Collada: fix for building without collada

[Gaia Clary]

Revision: 48019
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48019
Author:   gaiaclary
Date:     2012-06-18 00:27:30 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Collada: fix for building without collada

Modified Paths:
--------------
    trunk/blender/source/blender/editors/io/CMakeLists.txt
    trunk/blender/source/blender/editors/io/io_collada.c
    trunk/blender/source/blender/editors/io/io_ops.c

Modified: trunk/blender/source/blender/editors/io/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/io/CMakeLists.txt	2012-06-17 23:48:51 UTC (rev 48018)
+++ trunk/blender/source/blender/editors/io/CMakeLists.txt	2012-06-18 00:27:30 UTC (rev 48019)
@@ -39,4 +39,8 @@
     io_ops.h
 )
 
+if(WITH_OPENCOLLADA)
+	add_definitions(-DWITH_COLLADA)
+endif()
+
 blender_add_lib(bf_editor_io "${SRC}" "${INC}" "${INC_SYS}")

Modified: trunk/blender/source/blender/editors/io/io_collada.c
===================================================================
--- trunk/blender/source/blender/editors/io/io_collada.c	2012-06-17 23:48:51 UTC (rev 48018)
+++ trunk/blender/source/blender/editors/io/io_collada.c	2012-06-18 00:27:30 UTC (rev 48019)
@@ -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 @@
 	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

Modified: trunk/blender/source/blender/editors/io/io_ops.c
===================================================================
--- trunk/blender/source/blender/editors/io/io_ops.c	2012-06-17 23:48:51 UTC (rev 48018)
+++ trunk/blender/source/blender/editors/io/io_ops.c	2012-06-18 00:27:30 UTC (rev 48019)
@@ -28,11 +28,14 @@
  *  \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
 }