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:
authorJeroen Bakker <j.bakker@atmind.nl>2019-02-26 16:07:57 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-02-26 16:07:57 +0300
commit15edae617fa4e77095953932b0e3120e91d5beb5 (patch)
tree264b3f3473151d7ab4c5700bd6eb04c5aecdf4ab /intern/cycles/kernel
parentf76c15efb70207cf4e92708e0565110bbae854ab (diff)
parentdabe5cd31add8aa55b9ad4bce1b591ed4e98f1a1 (diff)
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r--intern/cycles/kernel/kernels/opencl/kernel_split_bundle.cl2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_split_bundle.cl b/intern/cycles/kernel/kernels/opencl/kernel_split_bundle.cl
index 71ea68382b4..6041f13b52b 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_split_bundle.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_split_bundle.cl
@@ -17,7 +17,9 @@
#include "kernel/kernel_compat_opencl.h" // PRECOMPILED
#include "kernel/split/kernel_split_common.h" // PRECOMPILED
+#include "kernel/kernels/opencl/kernel_data_init.cl"
#include "kernel/kernels/opencl/kernel_path_init.cl"
+#include "kernel/kernels/opencl/kernel_state_buffer_size.cl"
#include "kernel/kernels/opencl/kernel_scene_intersect.cl"
#include "kernel/kernels/opencl/kernel_queue_enqueue.cl"
#include "kernel/kernels/opencl/kernel_shader_setup.cl"