Merge pull request #1776 from dictoon/master

Fix rare regression in specular BTDF
appleseedhq · Dec 21, 2017 · 3d763c6 · 3d763c6
2 parents 0febbf1 + 9e2f932
commit 3d763c6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
diff --git a/sandbox/tests/test scenes/bsdf/metalbrdf/ref/01 - metalbrdf.png b/sandbox/tests/test scenes/bsdf/metalbrdf/ref/01 - metalbrdf.png
diff --git a/...test scenes/light tracing/ref/28 - cornell box with spheres - with caustics.png b/...test scenes/light tracing/ref/28 - cornell box with spheres - with caustics.png
diff --git a/sandbox/tests/test scenes/sppm/ref/02 - cornell box with spheres.png b/sandbox/tests/test scenes/sppm/ref/02 - cornell box with spheres.png
diff --git a/src/appleseed/renderer/modeling/bsdf/specularbtdf.cpp b/src/appleseed/renderer/modeling/bsdf/specularbtdf.cpp
@@ -185,6 +185,12 @@ namespace
                 }
             }
 
+            if (!cosine_mult)
+            {
+                const float cos_in = abs(dot(incoming, shading_normal));
+                sample.m_value.m_glossy /= cos_in;
+            }
+
             sample.m_value.m_beauty = sample.m_value.m_glossy;
 
             // The probability density of the sampled direction is the Dirac delta.

diff --git a/src/appleseed/renderer/modeling/project/projectfilewriter.cpp b/src/appleseed/renderer/modeling/project/projectfilewriter.cpp
@@ -1008,6 +1008,7 @@ bool ProjectFileWriter::write_packed_project_file(
         {
             RENDERER_LOG_INFO("packing project to %s...", filepath);
             zip(filepath, temp_directory.string());
+            RENDERER_LOG_INFO("packed project to %s...", filepath);
         }
     }
     catch (const std::exception&)