[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33270] trunk/lib/win64/opencollada: Update to r785
Nathan Letwory
nathan at letworyinteractive.com
Wed Nov 24 00:45:15 CET 2010
Revision: 33270
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33270
Author: jesterking
Date: 2010-11-24 00:45:15 +0100 (Wed, 24 Nov 2010)
Log Message:
-----------
Update to r785
Modified Paths:
--------------
trunk/lib/win64/opencollada/blender_r771.diff
trunk/lib/win64/opencollada/compile_opencollada_rev771.txt
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWColorOrTexture.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWFileInfo.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrParam.h
trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMorphController.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h
trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLSource.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWAnnotation.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWColorOrTexture.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWNode.h
trunk/lib/win64/opencollada/include/COLLADAStreamWriter/include/COLLADASWPrimitves.h
trunk/lib/win64/opencollada/lib/GeneratedSaxParser.lib
trunk/lib/win64/opencollada/lib/GeneratedSaxParser_d.lib
trunk/lib/win64/opencollada/lib/MathMLSolver.lib
trunk/lib/win64/opencollada/lib/MathMLSolver_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADABaseUtils.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADABaseUtils_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAFramework.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAFramework_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADASaxFrameworkLoader_d.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAStreamWriter.lib
trunk/lib/win64/opencollada/lib/OpenCOLLADAStreamWriter_d.lib
trunk/lib/win64/opencollada/lib/buffer.lib
trunk/lib/win64/opencollada/lib/buffer_d.lib
trunk/lib/win64/opencollada/lib/ftoa.lib
trunk/lib/win64/opencollada/lib/ftoa_d.lib
trunk/lib/win64/opencollada/lib/pcre.lib
trunk/lib/win64/opencollada/lib/pcre_d.lib
trunk/lib/win64/opencollada/lib/xml2.lib
trunk/lib/win64/opencollada/lib/xml2_d.lib
Modified: trunk/lib/win64/opencollada/blender_r771.diff
===================================================================
--- trunk/lib/win64/opencollada/blender_r771.diff 2010-11-23 20:32:15 UTC (rev 33269)
+++ trunk/lib/win64/opencollada/blender_r771.diff 2010-11-23 23:45:15 UTC (rev 33270)
@@ -1,6 +1,6 @@
Index: COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj
===================================================================
---- COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (revision 771)
+--- COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (revision 785)
+++ COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (working copy)
@@ -443,11 +443,12 @@
<Tool
@@ -54,7 +54,7 @@
Name="VCALinkTool"
Index: COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp
===================================================================
---- COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp (revision 771)
+--- COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp (revision 785)
+++ COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp (working copy)
@@ -6,6 +6,6 @@
Licensed under the MIT Open Source License,
@@ -68,7 +68,7 @@
+#include "COLLADABUStableHeaders.h"
Index: COLLADAFramework/scripts/COLLADAFramework.vcproj
===================================================================
---- COLLADAFramework/scripts/COLLADAFramework.vcproj (revision 771)
+--- COLLADAFramework/scripts/COLLADAFramework.vcproj (revision 785)
+++ COLLADAFramework/scripts/COLLADAFramework.vcproj (working copy)
@@ -450,10 +450,11 @@
<Tool
@@ -114,7 +114,7 @@
Name="VCALinkTool"
Index: COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj
===================================================================
---- COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj (revision 771)
+--- COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj (revision 785)
+++ COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj (working copy)
@@ -2071,10 +2071,11 @@
<Tool
@@ -160,7 +160,7 @@
Name="VCALinkTool"
Index: COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj
===================================================================
---- COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (revision 771)
+--- COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (revision 785)
+++ COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (working copy)
@@ -440,9 +440,11 @@
<Tool
@@ -204,7 +204,7 @@
Name="VCALinkTool"
Index: common/libBuffer/scripts/libBuffer.vcproj
===================================================================
---- common/libBuffer/scripts/libBuffer.vcproj (revision 771)
+--- common/libBuffer/scripts/libBuffer.vcproj (revision 785)
+++ common/libBuffer/scripts/libBuffer.vcproj (working copy)
@@ -1316,9 +1316,11 @@
<Tool
@@ -255,7 +255,7 @@
Name="VCALinkTool"
Index: common/libftoa/scripts/libftoa.vcproj
===================================================================
---- common/libftoa/scripts/libftoa.vcproj (revision 771)
+--- common/libftoa/scripts/libftoa.vcproj (revision 785)
+++ common/libftoa/scripts/libftoa.vcproj (working copy)
@@ -1314,9 +1314,11 @@
<Tool
@@ -310,7 +310,7 @@
Name="VCALinkTool"
Index: Externals/LibXML/scripts/LibXML.vcproj
===================================================================
---- Externals/LibXML/scripts/LibXML.vcproj (revision 771)
+--- Externals/LibXML/scripts/LibXML.vcproj (revision 785)
+++ Externals/LibXML/scripts/LibXML.vcproj (working copy)
@@ -473,7 +473,7 @@
IntermediateDirectory="..\obj\win\$(PlatformName)\$(ConfigurationName)"
@@ -349,7 +349,7 @@
Name="VCALinkTool"
Index: Externals/MathMLSolver/scripts/MathMLSolver.vcproj
===================================================================
---- Externals/MathMLSolver/scripts/MathMLSolver.vcproj (revision 771)
+--- Externals/MathMLSolver/scripts/MathMLSolver.vcproj (revision 785)
+++ Externals/MathMLSolver/scripts/MathMLSolver.vcproj (working copy)
@@ -593,11 +593,12 @@
<Tool
@@ -413,7 +413,7 @@
Name="VCALinkTool"
Index: Externals/pcre/scripts/pcre.vcproj
===================================================================
---- Externals/pcre/scripts/pcre.vcproj (revision 771)
+--- Externals/pcre/scripts/pcre.vcproj (revision 785)
+++ Externals/pcre/scripts/pcre.vcproj (working copy)
@@ -449,10 +449,12 @@
<Tool
@@ -473,7 +473,7 @@
Name="VCALinkTool"
Index: GeneratedSaxParser/scripts/GeneratedSaxParser.vcproj
===================================================================
---- GeneratedSaxParser/scripts/GeneratedSaxParser.vcproj (revision 771)
+--- GeneratedSaxParser/scripts/GeneratedSaxParser.vcproj (revision 785)
+++ GeneratedSaxParser/scripts/GeneratedSaxParser.vcproj (working copy)
@@ -1093,11 +1093,12 @@
<Tool
Modified: trunk/lib/win64/opencollada/compile_opencollada_rev771.txt
===================================================================
--- trunk/lib/win64/opencollada/compile_opencollada_rev771.txt 2010-11-23 20:32:15 UTC (rev 33269)
+++ trunk/lib/win64/opencollada/compile_opencollada_rev771.txt 2010-11-23 23:45:15 UTC (rev 33270)
@@ -1,7 +1,7 @@
-1. checkout collada libs rev 771
-svn checkout -r 771 http://opencollada.googlecode.com/svn/trunk/
+1. checkout collada libs rev 785
+svn checkout -r 785 http://opencollada.googlecode.com/svn/trunk/
-2. Apply patch blender_r771.diff. This patch set all projectfiles
+2. Apply patch blender_r785.diff. This patch set all projectfiles
ready for Blender. Necessary only on Windows
3. Open up the COLLADAMaya solution file
Modified: trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWColorOrTexture.h
===================================================================
--- trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWColorOrTexture.h 2010-11-23 20:32:15 UTC (rev 33269)
+++ trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWColorOrTexture.h 2010-11-23 23:45:15 UTC (rev 33270)
@@ -35,8 +35,8 @@
};
private:
+ Color mColor;
Type mType;
- Color mColor;
Texture mTexture;
public:
@@ -44,17 +44,17 @@
@param color The color that should be represented.
*/
ColorOrTexture ( Color color)
- : mColor ( color )
- , mType ( COLOR )
- , mTexture ( COLLADAFW::UniqueId::INVALID )
+ : mColor ( color )
+ , mType ( COLOR )
+ , mTexture ( COLLADAFW::UniqueId::INVALID )
{}
/** Constructor to create a ColorOrTexture object that represents a color.
@param texture The color that should be represented.
*/
ColorOrTexture ( Texture texture )
- : mTexture ( texture )
- , mType ( TEXTURE )
+ : mType ( TEXTURE )
+ , mTexture ( texture )
{}
/** Creates an invalid CommonColorOrTextureType*/
Modified: trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWFileInfo.h
===================================================================
--- trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWFileInfo.h 2010-11-23 20:32:15 UTC (rev 33269)
+++ trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWFileInfo.h 2010-11-23 23:45:15 UTC (rev 33270)
@@ -239,12 +239,12 @@
to the right, and which is considered inward. */
UpAxisType mUpAxisType;
+ /** A pair where you can hold file informations. */
+ ValuePairPointerArray mValuePairArray;
+
/** The absolute file uri.*/
COLLADABU::URI mAbsoluteFileUri;
- /** A pair where you can hold file informations. */
- ValuePairPointerArray mValuePairArray;
-
public:
/** Constructor. */
Modified: trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrParam.h
===================================================================
--- trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrParam.h 2010-11-23 20:32:15 UTC (rev 33269)
+++ trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrParam.h 2010-11-23 23:45:15 UTC (rev 33270)
@@ -43,14 +43,14 @@
private:
- /** The type of the current element. */
- Type mType;
-
/** The value is represented by a literal floating-point scalar, for example:
<float> 3.14 </float>. The sid attribute is optional. */
float mFloatValue;
- /** The value is represented by a reference to a previously defined parameter that can be
+ /** The type of the current element. */
+ Type mType;
+
+ /** The value is represented by a reference to a previously defined parameter that can be
directly cast to a floatingpoint scalar. See main entry. */
Param mParam;
@@ -64,9 +64,9 @@
/** Constructor. */
FloatOrParam ( const Param& param )
- : mParam ( param )
+ : mFloatValue ( -1 )
, mType ( PARAM )
- , mFloatValue ( -1 )
+ , mParam ( param )
{};
/** Destructor. */
Modified: trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMorphController.h
===================================================================
--- trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMorphController.h 2010-11-23 20:32:15 UTC (rev 33269)
+++ trunk/lib/win64/opencollada/include/COLLADAFramework/include/COLLADAFWMorphController.h 2010-11-23 23:45:15 UTC (rev 33270)
@@ -24,6 +24,9 @@
{
private:
+ /** The morph weights.*/
+ FloatOrDoubleArray mMorphWeights;
+
/**
* The original object id, if it in the original file format exist.
*/
@@ -35,8 +38,6 @@
/** The unique ids of the morph targets (geometries).*/
UniqueIdArray mMorphTargets;
- /** The morph weights.*/
- FloatOrDoubleArray mMorphWeights;
public:
Modified: trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h
===================================================================
--- trunk/lib/win64/opencollada/include/COLLADASaxFrameworkLoader/include/COLLADASaxFWLKinematicsIntermediateData.h 2010-11-23 20:32:15 UTC (rev 33269)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list