From e4e58d46128dc7fe4fb9b881d73b38173f00f5c3 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 6 Jun 2014 14:40:09 +0200 Subject: 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. --- intern/cycles/render/mesh_displace.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'intern/cycles/render/mesh_displace.cpp') 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); -- cgit v1.2.3