Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-20 00:28:16 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-20 00:53:19 +0300
commit52e34ffe333e1de83540555b6fcf2ff2b4532bc8 (patch)
tree739ee8417071e9c8d35e9e6791b763056518cc0c /intern/cycles/device/device_cuda.cpp
parentaeaa0ce3e8aafb45d84ba3dd73a500ae6f98eb02 (diff)
Cycles: Pass missing shader filter argument to CUDA and OpenCL kernels
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
-rw-r--r--intern/cycles/device/device_cuda.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index b87d1773bbc..39af40dec2a 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -787,6 +787,9 @@ public:
args[arg++] = &d_output_luma;
}
args[arg++] = &task.shader_eval_type;
+ if(task.shader_eval_type >= SHADER_EVAL_BAKE) {
+ args[arg++] = &task.shader_filter;
+ }
args[arg++] = &shader_x;
args[arg++] = &shader_w;
args[arg++] = &offset;