[Bf-blender-cvs] [7c788ad] fix-bake-dupli: Merge remote-tracking branch 'origin/master' into fix-bake-dupli

[Dalai Felinto]

Commit: 7c788ad6a831034af96933aeb55c618eedd2e8d7
Author: Dalai Felinto
Date:   Tue May 26 10:42:37 2015 -0300
Branches: fix-bake-dupli
https://developer.blender.org/rB7c788ad6a831034af96933aeb55c618eedd2e8d7

Merge remote-tracking branch 'origin/master' into fix-bake-dupli

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



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

diff --cc intern/cycles/kernel/kernels/opencl/kernel.cl
index 3b5d518,bffcd53..0128969
--- a/intern/cycles/kernel/kernels/opencl/kernel.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel.cl
@@@ -151,10 -151,9 +151,10 @@@ __kernel void kernel_ocl_convert_to_hal
  
  #define KERNEL_TEX(type, ttype, name) \
  	ccl_global type *name,
- #include "kernel_textures.h"
+ #include "../../kernel_textures.h"
  
  	float sample_scale,
 +	Transform *tfm,
  	int sx, int sy, int sw, int sh, int offset, int stride)
  {
  	KernelGlobals kglobals, *kg = &kglobals;