From fdcca14090ece17207ac89f171f85bd1e4236b4b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 8 May 2013 10:07:58 +0000 Subject: Fix #35255: build for older OpenCollada versions failed, but don't see a good reason to not keep it working. --- source/blender/collada/ExtraHandler.cpp | 9 +++++++++ source/blender/collada/ExtraHandler.h | 6 ++++++ 2 files changed, 15 insertions(+) (limited to 'source/blender/collada') 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 @@ -62,6 +62,15 @@ bool ExtraHandler::textData(const char *text, size_t textLength) return true; } +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, 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); -- cgit v1.2.3