[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56537] trunk/blender/source/blender/ collada: Fix #35255: build for older OpenCollada versions failed, but don' t see a good

[Brecht Van Lommel]

Revision: 56537
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56537
Author:   blendix
Date:     2013-05-08 10:07:58 +0000 (Wed, 08 May 2013)
Log Message:
-----------
Fix #35255: build for older OpenCollada versions failed, but don't see a good
reason to not keep it working.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/ExtraHandler.cpp
    trunk/blender/source/blender/collada/ExtraHandler.h

Modified: trunk/blender/source/blender/collada/ExtraHandler.cpp
===================================================================
--- trunk/blender/source/blender/collada/ExtraHandler.cpp	2013-05-08 07:15:06 UTC (rev 56536)
+++ trunk/blender/source/blender/collada/ExtraHandler.cpp	2013-05-08 10:07:58 UTC (rev 56537)
@@ -65,6 +65,15 @@
 bool ExtraHandler::parseElement(
         const char *profileName,
         const unsigned long& elementHash,
+        const COLLADAFW::UniqueId& uniqueId)
+{
+	/* implement for backwards compatibility, new version added object parameter */
+	parseElement(profileName, elementHash, uniqueId, NULL);
+}
+
+bool ExtraHandler::parseElement(
+        const char *profileName,
+        const unsigned long& elementHash,
         const COLLADAFW::UniqueId& uniqueId,
 		COLLADAFW::Object* object)
 {

Modified: trunk/blender/source/blender/collada/ExtraHandler.h
===================================================================
--- trunk/blender/source/blender/collada/ExtraHandler.h	2013-05-08 07:15:06 UTC (rev 56536)
+++ trunk/blender/source/blender/collada/ExtraHandler.h	2013-05-08 10:07:58 UTC (rev 56537)
@@ -63,6 +63,12 @@
 		const unsigned long& elementHash, 
 		const COLLADAFW::UniqueId& uniqueId,
 		COLLADAFW::Object* object);
+
+	/** For backwards compatibility with older OpenCollada, new version added object parameter */
+	bool parseElement ( 
+		const char* profileName, 
+		const unsigned long& elementHash, 
+		const COLLADAFW::UniqueId& uniqueId);
 private:
 	/** Disable default copy constructor. */
 	ExtraHandler(const ExtraHandler& pre);