[Bf-blender-cvs] [34003dd] master: Fix T43151: Collada meshes crash Blender

Campbell Barton noreply at git.blender.org
Tue Mar 3 05:39:28 CET 2015


Commit: 34003dd03440011c68c395afed715126a818c50e
Author: Campbell Barton
Date:   Tue Mar 3 15:30:45 2015 +1100
Branches: master
https://developer.blender.org/rB34003dd03440011c68c395afed715126a818c50e

Fix T43151: Collada meshes crash Blender

We have multiple reports of collada files crashing, run all meshes through validate.

===================================================================

M	source/blender/collada/MeshImporter.cpp

===================================================================

diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 02e78b9..a993f77 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.




More information about the Bf-blender-cvs mailing list