diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-06 16:40:09 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-06 17:39:04 +0400 |
| commit | e4e58d46128dc7fe4fb9b881d73b38173f00f5c3 (patch) | |
| tree | cc38ac39838bec84d28de396374ba022139a8aa2 /intern/cycles/render/mesh_displace.cpp | |
| parent | 553264ff8e20484d0b91bb468f56aa1b7144f7aa (diff) | |
Fix T40370: cycles CUDA baking timeout with high number of AA samples.
Now baking does one AA sample at a time, just like final render. There is
also some code for shader antialiasing that solves T40369 but it is disabled
for now because there may be unpredictable side effects.
Diffstat (limited to 'intern/cycles/render/mesh_displace.cpp')
| -rw-r--r-- | intern/cycles/render/mesh_displace.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp index 661fd9c66c1..4c0ee76299c 100644 --- a/intern/cycles/render/mesh_displace.cpp +++ b/intern/cycles/render/mesh_displace.cpp @@ -119,6 +119,7 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me task.shader_eval_type = SHADER_EVAL_DISPLACE; task.shader_x = 0; task.shader_w = d_output.size(); + task.num_samples = 1; task.get_cancel = function_bind(&Progress::get_cancel, &progress); device->task_add(task); |