diff options
author | Thomas Dinges <blender@dingto.org> | 2016-02-06 00:13:51 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-02-06 00:13:51 +0300 |
commit | 469447f7077e42ec73d71e51f8f6bebc918fdfa6 (patch) | |
tree | f3c080413cc8e54c90b0c0650a46ccf16ccd1bc6 /intern/cycles/render/svm.cpp | |
parent | ca88bc5ac13efd8ea7157ab97396db51bb0bda64 (diff) |
Cycles: Auto disable World MIS, if we only use a simple color.
When World MIS is enabled by the user, we now check if we actually need it.
In case of a simple node setup (no procedurals, no HDRs..) we auto disable MIS internally to save render time.
This change is important for upcoming default changes.
Diffstat (limited to 'intern/cycles/render/svm.cpp')
-rw-r--r-- | intern/cycles/render/svm.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index d715419530b..f3d39c1bd72 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -397,7 +397,11 @@ void SVMCompiler::generate_node(ShaderNode *node, ShaderNodeSet& done) stack_clear_users(node, done); stack_clear_temporary(node); - if(current_type == SHADER_TYPE_VOLUME) { + if(current_type == SHADER_TYPE_SURFACE) { + if(node->has_spatial_varying()) + current_shader->has_surface_spatial_varying = true; + } + else if(current_type == SHADER_TYPE_VOLUME) { if(node->has_spatial_varying()) current_shader->has_volume_spatial_varying = true; } @@ -761,6 +765,7 @@ void SVMCompiler::compile(Scene *scene, shader->has_bssrdf_bump = false; shader->has_volume = false; shader->has_displacement = false; + shader->has_surface_spatial_varying = false; shader->has_volume_spatial_varying = false; shader->has_object_dependency = false; shader->has_integrator_dependency = false; |