From 031a58dc027a7e6c4e630e64584d68b08fb52e2c Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sat, 16 Mar 2013 16:41:12 +0000 Subject: [PATCH] Fix for a crash due to mesh faces with wire frame materials not properly handled. A problem report by Vicente Carro through personal communications, many thanks! --- .../freestyle/intern/blender_interface/BlenderFileLoader.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 2e27eefadcb..860c7f5610d 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -82,7 +82,7 @@ NodeGroup *BlenderFileLoader::Load() if (!(obi->lay & _srl->lay)) continue; char *name = obi->ob->id.name; - //cout << name[0] << name[1] << ":" << (name+2) <<; + //printf("%c%c:%s\n", name[0], name[1], name+2); //print_m4("obi->mat", obi->mat); if (obi->obr->totvlak > 0) { @@ -463,6 +463,8 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) vlr = obr->vlaknodes[p>>8].vlak; else vlr++; + if (vlr->mat->material_type == MA_TYPE_WIRE) + continue; copy_v3_v3(v1, vlr->v1->co); copy_v3_v3(v2, vlr->v2->co); copy_v3_v3(v3, vlr->v3->co);