Commit: 69efa03b600fcdc01a0c8b99a50bcb0808734944
Author: Dalai Felinto
Date: Tue May 19 21:25:55 2015 -0300
Branches: fix-bake-dupli
https://developer.blender.org/rB69efa03b600fcdc01a0c8b99a50bcb0808734944
Merge remote-tracking branch 'origin/master' into fix-bake-dupli
Conflicts:
intern/cycles/kernel/kernel.cl
===================================================================
===================================================================
diff --cc intern/cycles/kernel/kernel.cl
index 75ecc66,cbc0592..3b5d518
--- a/intern/cycles/kernel/kernel.cl
+++ b/intern/cycles/kernel/kernel.cl
@@@ -140,7 -153,8 +153,9 @@@ __kernel void kernel_ocl_convert_to_hal
ccl_global type *name,
#include "kernel_textures.h"
- int type, Transform *tfm, int sx, int sw, int offset, int sample)
+ float sample_scale,
++ Transform *tfm,
+ int sx, int sy, int sw, int sh, int offset, int stride)
{
KernelGlobals kglobals, *kg = &kglobals;
@@@ -151,8 -165,10 +166,10 @@@
#include "kernel_textures.h"
int x = sx + get_global_id(0);
+ int y = sy + get_global_id(1);
- if(x < sx + sw)
- kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type,
tfm, x, offset, sample);
+ if(x < sx + sw && y < sy + sh)
+ kernel_film_convert_to_half_float(kg, rgba, buffer,
sample_scale, x, y, offset, stride);
}
-#endif // __COMPILE_ONLY_MEGAKERNEL__
++#endif // __COMPILE_ONLY_MEGAKERNEL__
diff --cc intern/cycles/kernel/kernel_sse41.cpp
index f7e999c,48579d3..a2fcbbe
--- a/intern/cycles/kernel/kernel_sse41.cpp
+++ b/intern/cycles/kernel/kernel_sse41.cpp
@@@ -67,10 -67,10 +67,10 @@@ void kernel_cpu_sse41_convert_to_half_f
/* Shader Evaluate */
- void kernel_cpu_sse41_shader(KernelGlobals *kg, uint4 *input, float4 *output,
Transform *tfm, int type, int i, int offset, int sample)
-void kernel_cpu_sse41_shader(KernelGlobals *kg, uint4 *input, float4 *output,
int type, int i, int offset, int sample)
++void kernel_cpu_sse41_shader(KernelGlobals *kg, uint4 *input, float4 *output,
int type, Transform *tfm, int i, int offset, int sample)
{
if(type >= SHADER_EVAL_BAKE)
- kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type,
i, offset, sample);
+ kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type,
tfm, i, offset, sample);
else
kernel_shader_evaluate(kg, input, output, (ShaderEvalType)type,
i, sample);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
