* update CMake and SCons for the OpenCollada update (to r746).
authorNathan Letwory <nathan@letworyinteractive.com>
Sun, 6 Jun 2010 00:33:59 +0000 (00:33 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Sun, 6 Jun 2010 00:33:59 +0000 (00:33 +0000)
  - DocumentExporter changed due to function name change in API
  - no more UTF lib
  - enabled by default for win32

Note: debug libs will be added later, as well as 64bit windows libs.

For other platforms, get r746 of OpenCollada and build against that.

CMakeLists.txt
config/win32-vc-config.py
source/blender/collada/DocumentExporter.cpp

index 287b3394456a5d3d3ecac3997e4a7757295aa430..7202ff9024c5b971737c6b5e674abdc37ae507f0 100644 (file)
@@ -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)
index b3766247d2de9797d7ed8cd89ce54f46859ac178..02bce0cc7f318fd37d2184e58bf54175d008973e 100644 (file)
@@ -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
index cf539ecf67c1da6935dfafaa1cb6ffc3dbae26ce..8cc8e7455c9df0bbf44ad2edd8bb0d74a1ed9f0a 100644 (file)
@@ -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