blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender2.7'

This commit is contained in:
Brecht Van Lommel 2019-01-24 19:02:10 +01:00
parent 7a353a7037 6260b3c15e
commit 63bacfed4b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
intern/cycles/render/session.cpp
View File

@ -886,7 +886,7 @@ bool Session::update_scene()
}
else {
/* Currently viewport render is faster with higher max_closures, needs investigating. */
kintegrator->max_closures = 64;
kintegrator->max_closures = MAX_CLOSURE;
}
progress.set_status("Updating Scene");
@ -1086,6 +1086,20 @@ int Session::get_max_closure_count()
max_closures = max(max_closures, num_closures);
}
max_closure_global = max(max_closure_global, max_closures);
if (max_closure_global > MAX_CLOSURE) {
/* This is usually harmless as more complex shader tend to get many
* closures discarded due to mixing or low weights. We need to limit
* to MAX_CLOSURE as this is hardcoded in CPU/mega kernels, and it
* avoids excessive memory usage for split kernels. */
VLOG(2) << "Maximum number of closures exceeded: "
<< max_closure_global
<< " > "
<< MAX_CLOSURE;
max_closure_global = MAX_CLOSURE;
}
return max_closure_global;
}