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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-05-01 22:46:15 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-05-01 22:46:15 +0400
commitc4956c8ddcb3c0e938a0ddaaea854e3662522cdb (patch)
treeaf8c2e588caf98aead2581b95ed28529a401bb75 /source/blender/freestyle
parentba5991592ea9a78595d2fd6075751874ff5a747c (diff)
Fix for a crash due to a corruption of data for addressing degenerate triangles in imported mesh data.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index eceaa7d5401..650a3419d22 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -564,7 +564,7 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
Vec3r v1(cleanVertices[vi1], cleanVertices[vi1+1], cleanVertices[vi1+2]);
Vec3r v2(cleanVertices[vi2], cleanVertices[vi2+1], cleanVertices[vi2+2]);
if (v0 == v1 || v0 == v2 || v1 == v2) {
- // do nothing for now
+ continue; // do nothing for now
}
else if (GeomUtils::distPointSegment<Vec3r>(v0, v1, v2) < 1e-6) {
detri.viP = vi0; detri.viA = vi1; detri.viB = vi2;