[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29320] trunk/blender/source/blender/ collada/DocumentExporter.cpp: Fix COLLADA build error.

Arystanbek Dyussenov arystan.d at gmail.com
Mon Jun 7 22:07:31 CEST 2010


Revision: 29320
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29320
Author:   kazanbas
Date:     2010-06-07 22:07:31 +0200 (Mon, 07 Jun 2010)

Log Message:
-----------
Fix COLLADA build error. This was caused by the difference in OpenCollada versions between Windows and Linux/Mac. Windows uses OpenCollada revision 746, Linux/Mac - 721.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=746

Modified Paths:
--------------
    trunk/blender/source/blender/collada/DocumentExporter.cpp

Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp	2010-06-07 20:03:40 UTC (rev 29319)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp	2010-06-07 20:07:31 UTC (rev 29320)
@@ -1719,7 +1719,11 @@
 				// most widespread de-facto standard.
 				texture.setProfileName("FCOLLADA");
 				texture.setChildElementName("bump");				
+#ifdef WIN32	// currently, Windows builds are using revision 746 of OpenCollada while Linux and Mac are using an older revision 721
 				ep.addExtraTechniqueColorOrTexture(COLLADASW::ColorOrTexture(texture));
+#else
+				ep.setExtraTechniqueColorOrTexture(COLLADASW::ColorOrTexture(texture));
+#endif
 			}
 		}
 		// performs the actual writing





More information about the Bf-blender-cvs mailing list