diff options
-rw-r--r-- | source/blender/makesrna/SConscript | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 21 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 4 |
5 files changed, 0 insertions, 35 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 993fa6adde5..a64963ff03e 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -48,9 +48,6 @@ if env['WITH_BF_LCMS']: 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') diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 4e624b76c7d..ecb0d903ae6 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -136,10 +136,6 @@ if(WITH_JACK) 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) diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index ac71e292552..5d49b626f54 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -88,9 +88,6 @@ if env['BF_UNIT_TEST']: 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' diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index f14b57e2b33..e891d64d514 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -76,19 +76,6 @@ static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, char *name 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 @@ void RNA_api_scene(StructRNA *srna) 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) diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 48b14c3881d..8f1cc4d839e 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -378,10 +378,6 @@ char *WM_operator_pystring(struct bContext *C, struct wmOperatorType *ot, struct 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;} |