[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55340] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp: Fix for a crash due to mesh faces with wire frame materials not properly handled .

[Tamito Kajiyama]

Revision: 55340
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55340
Author:   kjym3
Date:     2013-03-16 16:41:12 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
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!

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp	2013-03-16 16:38:18 UTC (rev 55339)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp	2013-03-16 16:41:12 UTC (rev 55340)
@@ -82,7 +82,7 @@
 		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 @@
 			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);