diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-08 14:07:58 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-08 14:07:58 +0400 |
commit | fdcca14090ece17207ac89f171f85bd1e4236b4b (patch) | |
tree | c08578a080ce0017556ef97e0c7227cf2b833b99 | |
parent | 13c0ef139fa2c571b14fe2d10a73c8b1a0eb1bd0 (diff) |
Fix #35255: build for older OpenCollada versions failed, but don't see a good
reason to not keep it working.
-rw-r--r-- | source/blender/collada/ExtraHandler.cpp | 9 | ||||
-rw-r--r-- | source/blender/collada/ExtraHandler.h | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/collada/ExtraHandler.cpp b/source/blender/collada/ExtraHandler.cpp index c72fdd9766b..bef7accd9f7 100644 --- a/source/blender/collada/ExtraHandler.cpp +++ b/source/blender/collada/ExtraHandler.cpp @@ -65,6 +65,15 @@ bool ExtraHandler::textData(const char *text, size_t textLength) bool ExtraHandler::parseElement( const char *profileName, const unsigned long& elementHash, + const COLLADAFW::UniqueId& uniqueId) +{ + /* implement for backwards compatibility, new version added object parameter */ + return parseElement(profileName, elementHash, uniqueId, NULL); +} + +bool ExtraHandler::parseElement( + const char *profileName, + const unsigned long& elementHash, const COLLADAFW::UniqueId& uniqueId, COLLADAFW::Object* object) { diff --git a/source/blender/collada/ExtraHandler.h b/source/blender/collada/ExtraHandler.h index d2da19acb78..f380c3d6871 100644 --- a/source/blender/collada/ExtraHandler.h +++ b/source/blender/collada/ExtraHandler.h @@ -63,6 +63,12 @@ public: 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); |