Fixed support for building without collada (scons and cmake). Only tested scons.

Re-enabled collada code building by default in cmake. Realized this should be off only in trunk.

CMakeLists.txt

@@ -80,7 +80,7 @@ OPTION(WITH_LZMA          "Enable best LZMA compression, used for pointcache" ON
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
 OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
+OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	ON)
 
 IF (APPLE)
 OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)

source/blender/windowmanager/CMakeLists.txt

@@ -50,6 +50,10 @@ IF(WITH_OPENEXR)
 	ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
+IF(WITH_OPENCOLLADA)
+	ADD_DEFINITIONS(-DWITH_COLLADA)
+ENDIF(WITH_OPENCOLLADA)
+
 IF(WITH_QUICKTIME)
 	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)

source/blender/windowmanager/SConscript

@@ -19,6 +19,9 @@ defs = []
 if not env['WITH_BF_PYTHON']:
 	defs.append('DISABLE_PYTHON')
 
+if env['WITH_BF_COLLADA']:
+	defs.append('WITH_COLLADA')
+
 if env['OURPLATFORM'] == 'linux2':
 	cflags='-pthread'
     	incs += ' ../../../extern/binreloc/include'

source/blender/windowmanager/intern/wm_operators.c

@@ -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);
 }