Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2012-08-12 21:13:07 +0400
committerGaia Clary <gaia.clary@machinimatrix.org>2012-08-12 21:13:07 +0400
commit10004d4a421b03f0cdf666b72b4cbadc216030e1 (patch)
tree7b38dc0abb454f96dc39c7095532b4a574292459 /source/blender/collada/DocumentImporter.cpp
parent3ebbfe2c406955ed765a697825cde0c891e83a24 (diff)
fixed: [#32240] Collada import when nodes share geometry but not material
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
-rw-r--r--source/blender/collada/DocumentImporter.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 7cfce9d2526..60b03a211ba 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -208,6 +208,10 @@ void DocumentImporter::finish()
write_node(roots[i], NULL, sce, NULL, false);
}
}
+
+
+ mesh_importer.optimize_material_assignements();
+
armature_importer.set_tags_map(this->uid_tags_map);
armature_importer.make_armatures(mContext);