From 1d46178d727cd746e8d14e3dd05d9bf6364d7ae0 Mon Sep 17 00:00:00 2001 From: jcarpent Date: Thu, 14 Dec 2017 19:27:08 +0100 Subject: [PATCH] [Fix] Use explicitelly colladom 1.4.1 --- src/osgPlugins/dae/ReaderWriterDAE.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/osgPlugins/dae/ReaderWriterDAE.cpp b/src/osgPlugins/dae/ReaderWriterDAE.cpp index 1fe0a11c1..8b11d53a9 100644 --- a/src/osgPlugins/dae/ReaderWriterDAE.cpp +++ b/src/osgPlugins/dae/ReaderWriterDAE.cpp @@ -65,7 +65,11 @@ ReaderWriterDAE::readNode(std::istream& fin, if (NULL == pDAE) { bOwnDAE = true; +#ifdef COLLADA_DOM_2_4_OR_LATER + pDAE = new DAE(NULL,NULL,"1.4.1"); +#else pDAE = new DAE; +#endif } std::auto_ptr scopedDae(bOwnDAE ? pDAE : NULL); // Deallocates locally created structure at scope exit @@ -139,7 +143,11 @@ ReaderWriterDAE::readNode(const std::string& fname, if (NULL == pDAE) { bOwnDAE = true; +#ifdef COLLADA_DOM_2_4_OR_LATER + pDAE = new DAE(NULL,NULL,"1.4.1"); +#else pDAE = new DAE; +#endif } std::auto_ptr scopedDae(bOwnDAE ? pDAE : NULL); // Deallocates locally created structure at scope exit @@ -232,7 +240,11 @@ ReaderWriterDAE::writeNode( const osg::Node& node, if (NULL == pDAE) { bOwnDAE = true; +#ifdef COLLADA_DOM_2_4_OR_LATER + pDAE = new DAE(NULL,NULL,"1.4.1"); +#else pDAE = new DAE; +#endif } std::auto_ptr scopedDae(bOwnDAE ? pDAE : NULL); // Deallocates locally created structure at scope exit