diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-16 20:41:12 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-16 20:41:12 +0400 |
| commit | 031a58dc027a7e6c4e630e64584d68b08fb52e2c (patch) | |
| tree | 55fa11dbd4b3097592be5b519a50afa6e9141ea3 /source/blender/freestyle | |
| parent | ed053f4730d8c78c6fa9e8a4de47e946abcceae9 (diff) | |
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!
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); |