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/render/shader.cpp
parentb84fad2ba3920f3e337dc9084a30f1ea38f39fc2 (diff)
Fix more Cycles CUDA errors after recent changes.
Diffstat (limited to 'intern/cycles/render/shader.cpp')
-rw-r--r--intern/cycles/render/shader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index e34f272d9b6..46e7d1b1d7b 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -561,10 +561,10 @@ void ShaderManager::device_update_common(Device *device,
/* film */
KernelFilm *kfilm = &dscene->data.film;
/* color space, needs to be here because e.g. displacement shaders could depend on it */
- kfilm->xyz_to_r = xyz_to_r;
- kfilm->xyz_to_g = xyz_to_g;
- kfilm->xyz_to_b = xyz_to_b;
- kfilm->rgb_to_y = rgb_to_y;
+ kfilm->xyz_to_r = float3_to_float4(xyz_to_r);
+ kfilm->xyz_to_g = float3_to_float4(xyz_to_g);
+ kfilm->xyz_to_b = float3_to_float4(xyz_to_b);
+ kfilm->rgb_to_y = float3_to_float4(rgb_to_y);
}
void ShaderManager::device_free_common(Device *, DeviceScene *dscene, Scene *scene)