FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #409 from jcarpent/master

Browse Source 
[Fix] Use explicitelly colladom 1.4.1
This commit is contained in:
OpenSceneGraph git repository 2017-12-18 10:39:29 +00:00 committed by GitHub
commit 24813331c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/dae/ReaderWriterDAE.cpp
View File

@ -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<DAE> 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<DAE> 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<DAE> scopedDae(bOwnDAE ? pDAE : NULL); // Deallocates locally created structure at scope exit