From eb50486df28ed52909736dbfa49d3ba1825aadac Mon Sep 17 00:00:00 2001 From: Arystanbek Dyussenov Date: Mon, 7 Jun 2010 20:07:31 +0000 Subject: 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. --- source/blender/collada/DocumentExporter.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/collada') diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index b474f65ac0d..01a41459a1d 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -1719,7 +1719,11 @@ public: // 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 -- cgit v1.2.3