1 files changed, 2 insertions, 24 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index 29d14442a47..d571ca135a1 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -425,19 +425,8 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
 	float v1[3], v2[3], v3[3];
 	float n1[3], n2[3], n3[3], facenormal[3];
 	int clip[3];
-	int wire_material = 0;
 	for (int a = 0; a < tottri; a++) {
 		const MLoopTri *lt = &mlooptri[a];
-		const MPoly *mp = &mpoly[lt->poly];
-		Material *mat = give_current_material(ob, mp->mat_nr + 1);
-
-		if (mat && mat->mode & MA_ONLYCAST) {
-			continue;
-		}
-		if (mat && mat->material_type == MA_TYPE_WIRE) {
-			wire_material = 1;
-			continue;
-		}
 
 		copy_v3_v3(v1, mvert[mloop[lt->tri[0]].v].co);
 		copy_v3_v3(v2, mvert[mloop[lt->tri[1]].v].co);
@@ -453,11 +442,6 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
 
 		numFaces += countClippedFaces(v1, v2, v3, clip);
 	}
-	if (wire_material) {
-		if (G.debug & G_DEBUG_FREESTYLE) {
-			cout << "Warning: Object " << name << " has wire materials (ignored)" << endl;
-		}
-	}
 #if 0
 	if (G.debug & G_DEBUG_FREESTYLE) {
 		cout << "numFaces " << numFaces << endl;
@@ -514,9 +498,6 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
 		const MPoly *mp = &mpoly[lt->poly];
 		Material *mat = give_current_material(ob, mp->mat_nr + 1);
 
-		if (mat && ((mat->mode & MA_ONLYCAST) || mat->material_type == MA_TYPE_WIRE))
-			continue;
-
 		copy_v3_v3(v1, mvert[mloop[lt->tri[0]].v].co);
 		copy_v3_v3(v2, mvert[mloop[lt->tri[1]].v].co);
 		copy_v3_v3(v3, mvert[mloop[lt->tri[2]].v].co);
@@ -566,11 +547,8 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
 		if (mat) {
 			tmpMat.setLine(mat->line_col[0], mat->line_col[1], mat->line_col[2], mat->line_col[3]);
 			tmpMat.setDiffuse(mat->r, mat->g, mat->b, mat->alpha);
-			tmpMat.setSpecular(mat->specr, mat->specg, mat->specb, mat->spectra);
-			float s = 1.0 * (mat->har + 1) / 4 ; // in Blender: [1;511] => in OpenGL: [0;128]
-			if (s > 128.f)
-				s = 128.f;
-			tmpMat.setShininess(s);
+			tmpMat.setSpecular(mat->specr, mat->specg, mat->specb, 1.0f);
+			tmpMat.setShininess(128.f);
 			tmpMat.setPriority(mat->line_priority);
 		}