mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

collada import bugfix

metadata
Wenzel Jakob 2014-01-05 20:01:14 +01:00
parent 60cd9cab5c
commit 7df6831aa3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/converter/collada.cpp
View File

@ -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;