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:
authorCampbell Barton <ideasman42@gmail.com>2015-03-03 07:30:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-03-03 07:30:45 +0300
commit34003dd03440011c68c395afed715126a818c50e (patch)
treee93015dc72c0e0a6c30cf76f5dff03cd33d94580
parent6d5ab8fdb7414e0619b87cacfc33d5fc8ff5bdc2 (diff)
Fix T43151: Collada meshes crash Blender
We have multiple reports of collada files crashing, run all meshes through validate.
-rw-r--r--source/blender/collada/MeshImporter.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 02e78b9bc45..a993f775782 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -1195,7 +1195,12 @@ bool MeshImporter::write_geometry(const COLLADAFW::Geometry *geom)
read_vertices(mesh, me);
read_polys(mesh, me);
- BKE_mesh_calc_edges(me, false, false);
+
+ // must validate before calculating edges
+ BKE_mesh_calc_normals(me);
+ BKE_mesh_validate(me, false, false);
+ // validation does this
+ // BKE_mesh_calc_edges(me, false, false);
// read_lines() must be called after the face edges have been generated.
// Oterwise the loose edges will be silently deleted again.