Revision: 29253
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29253
Author: jesterking
Date: 2010-06-06 02:33:59 +0200 (Sun, 06 Jun 2010)
Log Message:
-----------
* update CMake and SCons for the OpenCollada update (to r746).
- 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.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/config/win32-vc-config.py
trunk/blender/source/blender/collada/DocumentExporter.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-06-05 23:54:32 UTC (rev 29252)
+++ trunk/blender/CMakeLists.txt 2010-06-06 00:33:59 UTC (rev 29253)
@@ -422,7 +422,7 @@
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)
Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py 2010-06-05 23:54:32 UTC (rev
29252)
+++ trunk/blender/config/win32-vc-config.py 2010-06-06 00:33:59 UTC (rev
29253)
@@ -139,14 +139,14 @@
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
Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp 2010-06-05
23:54:32 UTC (rev 29252)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp 2010-06-06
00:33:59 UTC (rev 29253)
@@ -1709,7 +1709,7 @@
// 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
