diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-09 20:19:30 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-09 20:19:30 +0400 |
commit | f34d1d55850cd82fbae843ffafa7115dab0e0eeb (patch) | |
tree | f01c7b58dc5a66639d4e554ba206e1752d4fada8 /source/blender/collada/DocumentImporter.h | |
parent | 555bcc3298a564cb678c9f31ba6bded86d58bab6 (diff) |
[#33437](partial fix) Collada: importing a scene changes units. Added an option to disable unit settings during import.
Diffstat (limited to 'source/blender/collada/DocumentImporter.h')
-rw-r--r-- | source/blender/collada/DocumentImporter.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index 7e3476fb7e0..76d16f38a0c 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -47,6 +47,7 @@ #include "ArmatureImporter.h" #include "ControllerExporter.h" #include "MeshImporter.h" +#include "ImportSettings.h" @@ -63,7 +64,7 @@ public: Controller, //!< Second pass to collect controller data }; /** Constructor */ - DocumentImporter(bContext *C, const char *filename); + DocumentImporter(bContext *C, const ImportSettings *import_settings); /** Destructor */ ~DocumentImporter(); @@ -137,10 +138,10 @@ public: private: + const ImportSettings *import_settings; /** Current import stage we're in. */ ImportStage mImportStage; - std::string mFilename; bContext *mContext; |