diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-06-18 04:27:30 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-06-18 04:27:30 +0400 |
commit | 3ef74070c9995ad104712eed388f765f6cd10716 (patch) | |
tree | ecbf84449a77e3c18616e930ee248a341c35c2a2 /source/blender/editors/io | |
parent | 03b3468635b35ad1c98209d276ff55d4f8773d2c (diff) |
Collada: fix for building without collada
Diffstat (limited to 'source/blender/editors/io')
-rwxr-xr-x | source/blender/editors/io/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/io/io_collada.c | 5 | ||||
-rwxr-xr-x | source/blender/editors/io/io_ops.c | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index 49aec609379..ceefb7f8a47 100755 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -39,4 +39,8 @@ set(SRC io_ops.h ) +if(WITH_OPENCOLLADA) + add_definitions(-DWITH_COLLADA) +endif() + blender_add_lib(bf_editor_io "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 699b89fd42e..fcdd60aa94b 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -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 @@ void WM_OT_collada_import(wmOperatorType *ot) 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 diff --git a/source/blender/editors/io/io_ops.c b/source/blender/editors/io/io_ops.c index ed9b134b546..a06d54c2918 100755 --- a/source/blender/editors/io/io_ops.c +++ b/source/blender/editors/io/io_ops.c @@ -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 } |