From 0308dfecf5792ba8f25a91abca63e70c3bafc7a1 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 15 Mar 2018 16:12:40 +0000
Subject: [PATCH] Introduced a _specverson to centralizer the control of this
 variable

---
 src/osgPlugins/dae/ReaderWriterDAE.cpp | 7 ++++---
 src/osgPlugins/dae/ReaderWriterDAE.h   | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/dae/ReaderWriterDAE.cpp b/src/osgPlugins/dae/ReaderWriterDAE.cpp
index 8b11d53a9..1d63d1060 100644
--- a/src/osgPlugins/dae/ReaderWriterDAE.cpp
+++ b/src/osgPlugins/dae/ReaderWriterDAE.cpp
@@ -32,6 +32,7 @@
 
 #define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)
 
+
 osgDB::ReaderWriter::ReadResult
 ReaderWriterDAE::readNode(std::istream& fin,
         const osgDB::ReaderWriter::Options* options) const
@@ -66,7 +67,7 @@ ReaderWriterDAE::readNode(std::istream& fin,
     {
         bOwnDAE = true;
 #ifdef COLLADA_DOM_2_4_OR_LATER
-        pDAE = new DAE(NULL,NULL,"1.4.1");
+        pDAE = new DAE(NULL,NULL,_specversion);
 #else
         pDAE = new DAE;
 #endif
@@ -144,7 +145,7 @@ ReaderWriterDAE::readNode(const std::string& fname,
     {
         bOwnDAE = true;
 #ifdef COLLADA_DOM_2_4_OR_LATER
-        pDAE = new DAE(NULL,NULL,"1.4.1");
+        pDAE = new DAE(NULL,NULL,_specversion);
 #else
         pDAE = new DAE;
 #endif
@@ -241,7 +242,7 @@ ReaderWriterDAE::writeNode( const osg::Node& node,
     {
         bOwnDAE = true;
 #ifdef COLLADA_DOM_2_4_OR_LATER
-        pDAE = new DAE(NULL,NULL,"1.4.1");
+        pDAE = new DAE(NULL,NULL,_specversion);
 #else
         pDAE = new DAE;
 #endif
diff --git a/src/osgPlugins/dae/ReaderWriterDAE.h b/src/osgPlugins/dae/ReaderWriterDAE.h
index 87f23c963..2bea1bcf2 100644
--- a/src/osgPlugins/dae/ReaderWriterDAE.h
+++ b/src/osgPlugins/dae/ReaderWriterDAE.h
@@ -13,6 +13,8 @@ class ReaderWriterDAE : public osgDB::ReaderWriter
 public:
     ReaderWriterDAE()
     {
+        _specversion = "1.4.1";
+
         // Collada document
         supportsExtension("dae","COLLADA 1.4.x DAE format");
         // Collada zip archive (contains one or more dae files and a manifest.xml)
@@ -48,6 +50,7 @@ public:
 
 private:
     mutable OpenThreads::ReentrantMutex _serializerMutex;
+    const char* _specversion;
 };
 
 ///////////////////////////////////////////////////////////////////////////