diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-03-23 17:25:35 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-03-23 17:25:35 +0300 |
| commit | 3c45a2d2984723caba3846f143d90b3f0c69aede (patch) | |
| tree | 113dca92841eb2a1420dcc0cf098539490c7b2ba /source/blender/collada/DocumentImporter.cpp | |
| parent | 392829c6ea2350078f1018a216190cea8acf6e4f (diff) | |
COLLADA: supporting barebone class for <extra> support (incomplete).
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 91652957234..49992a6989f 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -49,6 +49,7 @@ #include "COLLADAFWLight.h" #include "COLLADASaxFWLLoader.h" +#include "COLLADASaxFWLIExtraDataCallbackHandler.h" #include "BLI_listbase.h" #include "BLI_math.h" @@ -74,10 +75,11 @@ #include "MEM_guardedalloc.h" +#include "ExtraHandler.h" #include "DocumentImporter.h" #include "TransformReader.h" -#include "collada_internal.h" +#include "collada_internal.h" #include "collada_utils.h" @@ -143,6 +145,10 @@ private: /** TODO Add error handler (implement COLLADASaxFWL::IErrorHandler */ COLLADASaxFWL::Loader loader; COLLADAFW::Root root(&loader, this); + ExtraHandler *ehandler = new ExtraHandler(); + + loader.registerExtraDataCallbackHandler(ehandler); + if (!root.loadDocument(mFilename)) return false; @@ -157,6 +163,8 @@ private: if (!root2.loadDocument(mFilename)) return false; + + delete ehandler; return true; } |