From 7df6831aa3d5e8595cff93588a099d5a5404455e Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Sun, 5 Jan 2014 20:01:14 +0100
Subject: [PATCH] collada import bugfix

---
 src/converter/collada.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/converter/collada.cpp b/src/converter/collada.cpp
index 0e2fde21..b75ee194 100644
--- a/src/converter/collada.cpp
+++ b/src/converter/collada.cpp
@@ -897,8 +897,6 @@ void loadMaterial(ColladaContext &ctx, domMaterial &mat) {
 		loadMaterialParam(ctx, "reflectance", diffuse, true);
 		ctx.os << "\t</bsdf>" << endl << endl;
 	} else if (blinn) {
-		SLog(EWarn, "\"%s\": Encountered a \"blinn\" COLLADA material, which is currently "
-			"unsupported in Mitsuba -- replacing it using a Phong material.", identifier.c_str());
 		domCommon_color_or_texture_type* diffuse = blinn->getDiffuse();
 		domCommon_color_or_texture_type* specular = blinn->getSpecular();
 		domCommon_float_or_param_type* shininess = blinn->getShininess();
@@ -912,7 +910,7 @@ void loadMaterial(ColladaContext &ctx, domMaterial &mat) {
 				isDiffuse = true;
 		}
 		if (isDiffuse) {
-			ctx.os << "\t<bsdf id=\"" << identifier << "\" type=\"diffuse\">" << endl;
+			ctx.os << "\t<bsdf id=\"phong\" type=\"diffuse\">" << endl;
 			loadMaterialParam(ctx, "reflectance", diffuse, false);
 			loadMaterialParam(ctx, "reflectance", diffuse, true);
 			ctx.os << "\t</bsdf>" << endl << endl;