Merge branch 'master' of github.com:appleseedhq/appleseed

appleseedhq · Aug 22, 2016 · 1e25ef3 · 1e25ef3
2 parents 98d1dc5 + dcca59c
commit 1e25ef3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/appleseed/renderer/modeling/bsdf/disneybrdf.cpp b/src/appleseed/renderer/modeling/bsdf/disneybrdf.cpp
@@ -391,6 +391,12 @@ namespace
             const bool              cosine_mult,
             BSDFSample&             sample) const APPLESEED_OVERRIDE
         {
+            // No reflection below the shading surface.
+            const Vector3d& n = sample.get_shading_basis().get_normal();
+            const double cos_on = dot(sample.m_outgoing.get_value(), n);
+            if (cos_on < 0.0)
+                return;
+
             const DisneyBRDFInputValues* values =
                 reinterpret_cast<const DisneyBRDFInputValues*>(data);
 
@@ -417,11 +423,6 @@ namespace
             }
             else
             {
-                const Vector3d& n = sample.get_shading_basis().get_normal();
-                const double cos_on = std::min(dot(sample.m_outgoing.get_value(), n), 1.0);
-                if (cos_on < 0.0)
-                    return;
-
                 if (s < cdf[SpecularComponent])
                 {
                     double alpha_x, alpha_y;

diff --git a/src/appleseed/renderer/modeling/object/meshobjectreader.cpp b/src/appleseed/renderer/modeling/object/meshobjectreader.cpp
@@ -740,7 +740,10 @@ namespace
             objects[i]->set_motion_segment_count(key_frames.size() - 1);
 
         for (size_t i = 0; i < objects.size(); ++i)
-            unshare_normals(*objects[i]);
+        {
+            if (objects[i]->get_vertex_normal_count() != 0)
+                unshare_normals(*objects[i]);
+        }
 
         for (size_t i = 1; i < key_frames.size(); ++i)
         {
@@ -756,7 +759,10 @@ namespace
                 return false;
 
             for (size_t j = 0; j < poses.size(); ++j)
-                unshare_normals(*poses[j]);
+            {
+                if (poses[j]->get_vertex_normal_count() != 0)
+                    unshare_normals(*poses[j]);
+            }
 
             if (!set_vertex_poses(
                     objects,