[Bf-blender-cvs] [5a34fed] cycles_split_kernel: Merge branch 'master' into cycles_split_kernel

Mai Lavelle noreply at git.blender.org
Tue Oct 25 10:57:00 CEST 2016


Commit: 5a34fedabd0b97b658a0e4d3b4d410fc01ee65c5
Author: Mai Lavelle
Date:   Tue Oct 25 10:56:24 2016 +0200
Branches: cycles_split_kernel
https://developer.blender.org/rB5a34fedabd0b97b658a0e4d3b4d410fc01ee65c5

Merge branch 'master' into cycles_split_kernel

===================================================================



===================================================================

diff --cc intern/cycles/kernel/split/kernel_split_common.h
index 62f1327,2135ee2..8cc7d36
--- a/intern/cycles/kernel/split/kernel_split_common.h
+++ b/intern/cycles/kernel/split/kernel_split_common.h
@@@ -20,10 -20,8 +20,11 @@@
  #include "kernel_compat_opencl.h"
  #include "kernel_math.h"
  #include "kernel_types.h"
 +
 +#include "kernel_split_data.h"
 +
  #include "kernel_globals.h"
+ #include "kernel_image_opencl.h"
  
  #include "util_atomic.h"




More information about the Bf-blender-cvs mailing list