Commit: c07bce5bf2b35d66a5574b40f8d9378086e9117f
Author: Brecht Van Lommel
Date: Tue Apr 16 03:03:24 2019 +0200
Branches: blender2.7
https://developer.blender.org/rBc07bce5bf2b35d66a5574b40f8d9378086e9117f
Fix T63796: Cycles OSL shader with closure not working in final render.
===================================================================
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index d4b1a5e843b..beb82f2ab7d 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -1131,6 +1131,12 @@ void Session::collect_statistics(RenderStats
*render_stats)
int Session::get_max_closure_count()
{
+ if (scene->shader_manager->use_osl()) {
+ /* OSL always needs the maximum as we can't predict the
+ * number of closures a shader might generate. */
+ return MAX_CLOSURE;
+ }
+
int max_closures = 0;
for(int i = 0; i < scene->shaders.size(); i++) {
int num_closures = scene->shaders[i]->graph->get_num_closures();
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
