diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-30 01:51:53 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-30 01:51:53 +0400 |
| commit | 1a3a252e06811bdf625dbd0b7bed5de3b3e428a2 (patch) | |
| tree | 568a18edfb0187e42753e453f7b19fc4a1811f6c /source/blender/collada/DocumentImporter.cpp | |
| parent | c8958eea295a7dac07b02e50b81e377545cea7a0 (diff) | |
Collada: Import now always rotates input to match blender's Z_UP axis
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 80bde1842dd..97678159247 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -185,6 +185,7 @@ void DocumentImporter::finish() Main *bmain = CTX_data_main(mContext); // TODO: create a new scene except the selected <visual_scene> - use current blender scene for it Scene *sce = CTX_data_scene(mContext); + unit_converter.calculate_scale(*sce); /** TODO Break up and put into 2-pass parsing of DAE */ std::vector<const COLLADAFW::VisualScene *>::iterator it; @@ -224,10 +225,8 @@ void DocumentImporter::finish() std::vector<Object *> *objects_done; objects_done = write_node(roots[i], NULL, sce, NULL, false); - if (!this->import_settings->import_units) { - // Match incoming scene with current unit settings - bc_match_scale(objects_done, *sce, unit_converter); - } + // Match incoming scene with current unit settings + bc_match_scale(objects_done, unit_converter, !this->import_settings->import_units); } // update scene |