archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for a crash due to mesh faces with wire frame materials not properly handled.

Browse Source 
A problem report by Vicente Carro through personal communications, many thanks!
This commit is contained in:
Tamito Kajiyama
2013-03-16 16:41:12 +00:00
parent ed053f4730
commit 031a58dc02
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
View File

@@ -82,7 +82,7 @@ NodeGroup *BlenderFileLoader::Load()
if (!(obi->lay & _srl->lay)) if (!(obi->lay & _srl->lay))
continue; continue;
char *name = obi->ob->id.name; 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); //print_m4("obi->mat", obi->mat);
if (obi->obr->totvlak > 0) { if (obi->obr->totvlak > 0) {
@@ -463,6 +463,8 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
vlr = obr->vlaknodes[p>>8].vlak; vlr = obr->vlaknodes[p>>8].vlak;
else else
vlr++; vlr++;
if (vlr->mat->material_type == MA_TYPE_WIRE)
continue;
copy_v3_v3(v1, vlr->v1->co); copy_v3_v3(v1, vlr->v1->co);
copy_v3_v3(v2, vlr->v2->co); copy_v3_v3(v2, vlr->v2->co);
copy_v3_v3(v3, vlr->v3->co); copy_v3_v3(v3, vlr->v3->co);