diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-28 22:03:01 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-28 22:03:01 +0400 |
| commit | 32ec0c762e9f19754e1176a177bedfcb74c74786 (patch) | |
| tree | d92de59f9ffcd8984d5ab951cb516ca98dd6fe12 /source/blender/collada | |
| parent | 4707f1de174c5c4d498c7a87391788bca8b1945c (diff) | |
Updated Blender Collada module to newest opencollada API
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/ExtraHandler.cpp | 3 | ||||
| -rw-r--r-- | source/blender/collada/ExtraHandler.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/collada/ExtraHandler.cpp b/source/blender/collada/ExtraHandler.cpp index 7b8d315b8c5..c72fdd9766b 100644 --- a/source/blender/collada/ExtraHandler.cpp +++ b/source/blender/collada/ExtraHandler.cpp @@ -65,7 +65,8 @@ bool ExtraHandler::textData(const char *text, size_t textLength) bool ExtraHandler::parseElement( const char *profileName, const unsigned long& elementHash, - const COLLADAFW::UniqueId& uniqueId) + const COLLADAFW::UniqueId& uniqueId, + COLLADAFW::Object* object) { if (BLI_strcaseeq(profileName, "blender")) { //printf("In parseElement for supported profile %s for id %s\n", profileName, uniqueId.toAscii().c_str()); diff --git a/source/blender/collada/ExtraHandler.h b/source/blender/collada/ExtraHandler.h index aa1ae52a521..d2da19acb78 100644 --- a/source/blender/collada/ExtraHandler.h +++ b/source/blender/collada/ExtraHandler.h @@ -61,7 +61,8 @@ public: bool parseElement ( const char* profileName, const unsigned long& elementHash, - const COLLADAFW::UniqueId& uniqueId ); + const COLLADAFW::UniqueId& uniqueId, + COLLADAFW::Object* object); private: /** Disable default copy constructor. */ ExtraHandler(const ExtraHandler& pre); |