diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 4 | ||||
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 287b3394456..7202ff9024c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -422,7 +422,7 @@ IF(WIN32) SET(OPENCOLLADA ${LIBDIR}/opencollada) SET(OPENCOLLADA_INC ${OPENCOLLADA}/include) SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) - SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa) + SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa) #pcre is bundled with openCollada #SET(PCRE ${LIBDIR}/pcre) #SET(PCRE_LIBPATH ${PCRE}/lib) diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index b3766247d2d..02bce0cc7f3 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -139,14 +139,14 @@ BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib' WITH_BF_REDCODE = False BF_REDCODE_INC = '#extern' -WITH_BF_COLLADA = False +WITH_BF_COLLADA = True BF_COLLADA = '#source/blender/collada' BF_COLLADA_INC = '${BF_COLLADA}' BF_COLLADA_LIB = 'bf_collada' BF_OPENCOLLADA = LIBDIR + '/opencollada' BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' -BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre buffer ftoa' +BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa' BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' #Ray trace optimization diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index cf539ecf67c..8cc8e7455c9 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -1709,7 +1709,7 @@ public: // most widespread de-facto standard. texture.setProfileName("FCOLLADA"); texture.setChildElementName("bump"); - ep.setExtraTechniqueColorOrTexture(COLLADASW::ColorOrTexture(texture)); + ep.addExtraTechniqueColorOrTexture(COLLADASW::ColorOrTexture(texture)); } } // performs the actual writing |