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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-06-15 16:58:48 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-06-15 17:28:09 +0300
commit2e25a48b05004112344b04cd56760709eebfc1a4 (patch)
tree53d9bd7e2a411d05ef40c82bce58b9021afb0311 /intern/cycles/kernel/kernel_color.h
parentb84fad2ba3920f3e337dc9084a30f1ea38f39fc2 (diff)
Fix more Cycles CUDA errors after recent changes.
Diffstat (limited to 'intern/cycles/kernel/kernel_color.h')
-rw-r--r--intern/cycles/kernel/kernel_color.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_color.h b/intern/cycles/kernel/kernel_color.h
index d1c3dac824d..990e798543a 100644
--- a/intern/cycles/kernel/kernel_color.h
+++ b/intern/cycles/kernel/kernel_color.h
@@ -23,16 +23,16 @@ CCL_NAMESPACE_BEGIN
ccl_device float3 xyz_to_rgb(KernelGlobals *kg, float3 xyz)
{
- return make_float3(dot(kernel_data.film.xyz_to_r, xyz),
- dot(kernel_data.film.xyz_to_g, xyz),
- dot(kernel_data.film.xyz_to_b, xyz));
+ return make_float3(dot(float4_to_float3(kernel_data.film.xyz_to_r), xyz),
+ dot(float4_to_float3(kernel_data.film.xyz_to_g), xyz),
+ dot(float4_to_float3(kernel_data.film.xyz_to_b), xyz));
}
ccl_device float linear_rgb_to_gray(KernelGlobals *kg, float3 c)
{
- return dot(c, kernel_data.film.rgb_to_y);
+ return dot(c, float4_to_float3(kernel_data.film.rgb_to_y));
}
CCL_NAMESPACE_END
-#endif /* __KERNEL_COLOR_H__ */ \ No newline at end of file
+#endif /* __KERNEL_COLOR_H__ */