[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33065] trunk/blender/source/blender: r33039 added dependency to COLLADA for blenderplayer, but it' s really not needed there.

Nathan Letwory nathan at letworyinteractive.com
Sun Nov 14 21:40:55 CET 2010


Revision: 33065
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33065
Author:   jesterking
Date:     2010-11-14 21:40:55 +0100 (Sun, 14 Nov 2010)

Log Message:
-----------
r33039 added dependency to COLLADA for blenderplayer, but it's really not needed there.

Stubbing for now.

Modified Paths:
--------------
    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/intern/rna_scene_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene_api.c	2010-11-14 19:46:14 UTC (rev 33064)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene_api.c	2010-11-14 20:40:55 UTC (rev 33065)
@@ -77,6 +77,8 @@
 
 static void rna_Scene_collada_export(Scene *scene, 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);
 }
 

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-11-14 19:46:14 UTC (rev 33064)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-11-14 20:40:55 UTC (rev 33065)
@@ -372,6 +372,10 @@
 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;}





More information about the Bf-blender-cvs mailing list