[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34026] trunk/blender/source/blender: remove rna func scene.collada_export(), export functions dont exist for any other formats, calling operators should suffice.

[Campbell Barton]

Revision: 34026
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34026
Author:   campbellbarton
Date:     2011-01-03 08:42:30 +0100 (Mon, 03 Jan 2011)

Log Message:
-----------
remove rna func scene.collada_export(), export functions dont exist for any other formats, calling operators should suffice. 

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/SConscript
    trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
    trunk/blender/source/blender/makesrna/intern/SConscript
    trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript	2011-01-03 07:07:18 UTC (rev 34025)
+++ trunk/blender/source/blender/makesrna/SConscript	2011-01-03 07:42:30 UTC (rev 34026)
@@ -48,9 +48,6 @@
 if env['WITH_BF_GAMEENGINE']:
     defs.append('WITH_GAMEENGINE')
 
-if env['WITH_BF_COLLADA']:
-    defs.append('WITH_COLLADA')
-
 if env['BF_UNIT_TEST']:
     defs.append('UNIT_TEST')
 

Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2011-01-03 07:07:18 UTC (rev 34025)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2011-01-03 07:42:30 UTC (rev 34026)
@@ -136,10 +136,6 @@
 	add_definitions(-DWITH_JACK)
 endif()
 
-if(WITH_OPENCOLLADA)
-	add_definitions(-DWITH_COLLADA)
-endif()
-
 # Build makesrna executable
 add_executable(makesrna ${SRC} ${INC_FILES})
 target_link_libraries(makesrna bf_dna)

Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript	2011-01-03 07:07:18 UTC (rev 34025)
+++ trunk/blender/source/blender/makesrna/intern/SConscript	2011-01-03 07:42:30 UTC (rev 34026)
@@ -88,9 +88,6 @@
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
 
-if env['WITH_BF_COLLADA']:
-    defs.append('WITH_COLLADA')
-
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
     incs += ' ../../../extern/binreloc/include'

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene_api.c	2011-01-03 07:07:18 UTC (rev 34025)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene_api.c	2011-01-03 07:42:30 UTC (rev 34026)
@@ -76,19 +76,6 @@
 		BKE_makepicstring(name, rd->pic, (frame==INT_MIN) ? rd->cfra : frame, rd->imtype, rd->scemode & R_EXTENSION, TRUE);
 }
 
-#ifdef WITH_COLLADA
-
-#include "../../collada/collada.h"
-
-static void rna_Scene_collada_export(Scene *scene, const char *filepath)
-{
-	/* XXX not really nice, as this will bring essentially in COLLADA as dependency for
-	 * blenderplayer. For now stubbing in blc. */
-	collada_export(scene, filepath);
-}
-
-#endif
-
 #else
 
 void RNA_api_scene(StructRNA *srna)
@@ -104,14 +91,6 @@
 
 	func= RNA_def_function(srna, "update", "rna_Scene_update_tagged");
 	RNA_def_function_ui_description(func, "Update data tagged to be updated from previous access to data or operators.");
-
-#ifdef WITH_COLLADA
-	func= RNA_def_function(srna, "collada_export", "rna_Scene_collada_export");
-	parm= RNA_def_string(func, "filepath", "", FILE_MAX, "File Path", "File path to write Collada file.");
-	RNA_def_property_flag(parm, PROP_REQUIRED);
-	RNA_def_property_subtype(parm, PROP_FILEPATH); /* allow non utf8 */
-	RNA_def_function_ui_description(func, "Export to collada file.");
-#endif
 }
 
 void RNA_api_scene_render(StructRNA *srna)

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2011-01-03 07:07:18 UTC (rev 34025)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2011-01-03 07:42:30 UTC (rev 34026)
@@ -247,6 +247,8 @@
 void uiLayoutSetAlignment(struct uiLayout *layout, int alignment){}
 void uiLayoutSetScaleX(struct uiLayout *layout, float scale){}
 void uiLayoutSetScaleY(struct uiLayout *layout, float scale){}
+void uiLayoutSetRedAlert(struct uiLayout *layout, int redalert){}
+int uiLayoutGetRedAlert(struct uiLayout *layout) {return 0;}
 void ED_base_object_free_and_unlink(struct Scene *scene, struct Base *base){}
 void ED_mesh_calc_normals(struct Mesh *me){}
 void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces){}
@@ -378,10 +380,6 @@
 struct wmKeyMapItem *WM_modalkeymap_add_item(struct wmKeyMap *km, int type, int val, int modifier, int keymodifier, int value){return (struct wmKeyMapItem *)NULL;}
 struct wmKeyMap *WM_modalkeymap_add(struct wmKeyConfig *keyconf, char *idname, EnumPropertyItem *items){return (struct wmKeyMap *) NULL;}
 
-/* RNA Collada dependency */
-int collada_export(struct Scene *sce, const char *filepath){return 0;}
-
-
 /* intern/decimation */
 int LOD_FreeDecimationData(struct LOD_Decimation_Info *info){return 0;}
 int LOD_CollapseEdge(struct LOD_Decimation_Info *info){return 0;}