[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32239] trunk/lib/windows/opencollada/ blender_r769.diff: Committed here too the wrong patch :?\194?\176
Nathan Letwory
nathan at letworyinteractive.com
Fri Oct 1 22:44:56 CEST 2010
Revision: 32239
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32239
Author: jesterking
Date: 2010-10-01 22:44:56 +0200 (Fri, 01 Oct 2010)
Log Message:
-----------
Committed here too the wrong patch :?\194?\176
Modified Paths:
--------------
trunk/lib/windows/opencollada/blender_r769.diff
Modified: trunk/lib/windows/opencollada/blender_r769.diff
===================================================================
--- trunk/lib/windows/opencollada/blender_r769.diff 2010-10-01 20:43:01 UTC (rev 32238)
+++ trunk/lib/windows/opencollada/blender_r769.diff 2010-10-01 20:44:56 UTC (rev 32239)
@@ -1,21 +1,21 @@
Index: COLLADABaseUtils/include/COLLADABUPrerequisites.h
===================================================================
---- COLLADABaseUtils/include/COLLADABUPrerequisites.h (revision 746)
+--- COLLADABaseUtils/include/COLLADABUPrerequisites.h (revision 769)
+++ COLLADABaseUtils/include/COLLADABUPrerequisites.h (working copy)
@@ -25,7 +25,7 @@
- #endif
+ }
+
+ #define COLLADABU_HAVE_TR1_UNORDERED_MAP
+-#ifndef WIN32
++#ifndef COLLADABU_OS_WIN
+ #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+ #undef COLLADABU_HAVE_TR1_UNORDERED_MAP
#else
- # undef COLLADABU_HAVE_TR1_UNORDERED_MAP
--# if defined(_MSC_VER) && (_MSC_VER >= 1500) \
-+# if defined(_MSC_VER) && (_MSC_VER >= 1600) \
- && defined(_MSC_FULL_VER) && \
- !defined(__SGI_STL_PORT) && \
- !defined(_STLPORT_VERSION) && \
Index: COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj
===================================================================
---- COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (revision 746)
+--- COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (revision 769)
+++ COLLADABaseUtils/scripts/COLLADABaseUtils.vcproj (working copy)
-@@ -437,10 +437,11 @@
+@@ -443,11 +443,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
@@ -24,11 +24,12 @@
AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED"
RuntimeLibrary="0"
+ RuntimeTypeInfo="false"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="COLLADABUStableHeaders.h"
WarningLevel="3"
-@@ -459,6 +460,7 @@
+@@ -466,6 +467,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\$(ProjectName).lib"
@@ -36,7 +37,7 @@
/>
<Tool
Name="VCALinkTool"
-@@ -503,15 +505,16 @@
+@@ -510,16 +512,17 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
@@ -45,6 +46,7 @@
AdditionalIncludeDirectories="..\include;..\include\Math;..\..\Externals\UTF\include;..\..\Externals\pcre\include"
PreprocessorDefinitions="WIN64;NDEBUG;_LIB;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PCRE_STATIC;COLLADABU_USE_PCRE_PRECOMPILED"
RuntimeLibrary="0"
+ RuntimeTypeInfo="false"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="COLLADABUStableHeaders.h"
@@ -55,7 +57,7 @@
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -525,6 +528,7 @@
+@@ -533,6 +536,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\$(ProjectName).lib"
@@ -63,9 +65,77 @@
/>
<Tool
Name="VCALinkTool"
+Index: COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp
+===================================================================
+--- COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp (revision 769)
++++ COLLADABaseUtils/src/COLLADABUPrecompiledHeaders.cpp (working copy)
+@@ -6,6 +6,6 @@
+ Licensed under the MIT Open Source License,
+ for details please see LICENSE file or the website
+ http://www.opensource.org/licenses/mit-license.php
+-*/
+-
+-#include "COLLADABUStableHeaders.h"
++*/
++
++#include "COLLADABUStableHeaders.h"
+Index: COLLADAFramework/include/COLLADAFWEffect.h
+===================================================================
+--- COLLADAFramework/include/COLLADAFWEffect.h (revision 769)
++++ COLLADAFramework/include/COLLADAFWEffect.h (working copy)
+@@ -47,8 +47,8 @@
+
+ /**
+ * The original object id, if it in the original file format exist.
+- */
+- String mOriginalId;
++ */
++ String mOriginalId;
+
+ /**
+ * Pretty-print name for this effect. Optional.
+@@ -87,12 +87,12 @@
+
+ /**
+ * The original object id, if it in the original file format exist.
+- */
++ */
+ const String& getOriginalId () const { return mOriginalId; }
+
+ /**
+ * The original object id, if it in the original file format exist.
+- */
++ */
+ void setOriginalId ( const String& val ) { mOriginalId = val; }
+
+ /** Pretty-print name for this effect. Optional. */
+Index: COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h
+===================================================================
+--- COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h (revision 769)
++++ COLLADAFramework/include/COLLADAFWTextureCoordinateBinding.h (working copy)
+@@ -32,6 +32,9 @@
+ /** The set index of the set of texture coordinates uses by the effect for parameter
+ with parameter id. */
+ size_t mSetIndex;
++
++ /** The semantic used for this texture coordinate binding (<bind_vertex_input> attribute semantic) */
++ String mName;
+
+ public:
+
+@@ -52,6 +55,9 @@
+ with parameter id. */
+ const size_t& getSetIndex () const { return mSetIndex; }
+ void setSetIndex ( const size_t& val ) { mSetIndex = val; }
++
++ const String getName() const { return mName; }
++ void setName( const String& val ) { mName = val; }
+
+ /** Operator overloading. */
+ bool operator<( const TextureCoordinateBinding& rhs) const
Index: COLLADAFramework/scripts/COLLADAFramework.vcproj
===================================================================
---- COLLADAFramework/scripts/COLLADAFramework.vcproj (revision 746)
+--- COLLADAFramework/scripts/COLLADAFramework.vcproj (revision 769)
+++ COLLADAFramework/scripts/COLLADAFramework.vcproj (working copy)
@@ -450,10 +450,11 @@
<Tool
@@ -78,7 +148,7 @@
RuntimeLibrary="0"
+ BufferSecurityCheck="false"
TreatWChar_tAsBuiltInType="true"
- RuntimeTypeInfo="true"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
@@ -474,6 +475,7 @@
<Tool
@@ -111,7 +181,7 @@
Name="VCALinkTool"
Index: COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj
===================================================================
---- COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj (revision 746)
+--- COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj (revision 769)
+++ COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcproj (working copy)
@@ -2071,10 +2071,11 @@
<Tool
@@ -124,7 +194,7 @@
RuntimeLibrary="0"
+ BufferSecurityCheck="false"
TreatWChar_tAsBuiltInType="true"
- RuntimeTypeInfo="true"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
@@ -2095,6 +2096,7 @@
<Tool
@@ -155,9 +225,21 @@
/>
<Tool
Name="VCALinkTool"
+Index: COLLADASaxFrameworkLoader/src/COLLADASaxFWLNodeLoader.cpp
+===================================================================
+--- COLLADASaxFrameworkLoader/src/COLLADASaxFWLNodeLoader.cpp (revision 769)
++++ COLLADASaxFrameworkLoader/src/COLLADASaxFWLNodeLoader.cpp (working copy)
+@@ -315,6 +315,7 @@
+ {
+ COLLADAFW::TextureCoordinateBinding texCoordinateBinding;
+ texCoordinateBinding.setSetIndex ( (size_t)attributeData.input_set );
++ texCoordinateBinding.setName( attributeData.semantic );
+ texCoordinateBinding.setTextureMapId ( getHandlingFilePartLoader()->getTextureMapIdBySematic( attributeData.semantic ) );
+ mCurrentTextureCoordinateBindings.insert(texCoordinateBinding);
+ }
Index: COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj
===================================================================
---- COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (revision 746)
+--- COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (revision 769)
+++ COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcproj (working copy)
@@ -440,9 +440,11 @@
<Tool
@@ -201,7 +283,7 @@
Name="VCALinkTool"
Index: common/libBuffer/scripts/libBuffer.vcproj
===================================================================
---- common/libBuffer/scripts/libBuffer.vcproj (revision 746)
+--- common/libBuffer/scripts/libBuffer.vcproj (revision 769)
+++ common/libBuffer/scripts/libBuffer.vcproj (working copy)
@@ -1316,9 +1316,11 @@
<Tool
@@ -232,14 +314,16 @@
>
<Tool
Name="VCPreBuildEventTool"
-@@ -1383,6 +1386,7 @@
+@@ -1383,7 +1386,8 @@
AdditionalIncludeDirectories="..\include;..\..\libftoa\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF"
RuntimeLibrary="0"
+- RuntimeTypeInfo="false"
+ BufferSecurityCheck="false"
- RuntimeTypeInfo="true"
++ RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
@@ -1400,6 +1404,7 @@
/>
<Tool
@@ -250,7 +334,7 @@
Name="VCALinkTool"
Index: common/libftoa/scripts/libftoa.vcproj
===================================================================
---- common/libftoa/scripts/libftoa.vcproj (revision 746)
+--- common/libftoa/scripts/libftoa.vcproj (revision 769)
+++ common/libftoa/scripts/libftoa.vcproj (working copy)
@@ -1314,9 +1314,11 @@
<Tool
@@ -281,7 +365,7 @@
>
<Tool
Name="VCPreBuildEventTool"
-@@ -1378,9 +1381,11 @@
+@@ -1378,10 +1381,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
@@ -289,10 +373,12 @@
AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CONSOLE;HAVE_SNPRINTF;PREFER_PORTABLE_SNPRINTF"
RuntimeLibrary="0"
+- RuntimeTypeInfo="false"
+ BufferSecurityCheck="false"
- RuntimeTypeInfo="true"
++ RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
@@ -1398,6 +1403,7 @@
/>
<Tool
@@ -303,9 +389,9 @@
Name="VCALinkTool"
Index: Externals/LibXML/scripts/LibXML.vcproj
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list