diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-15 17:32:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-15 17:32:31 +0300 |
| commit | 23b3901057c65269710e810845908ab935cefe06 (patch) | |
| tree | 7d9c4233c3126ac012294f0c1b0dc1f356f7eaee /intern/cycles/render/shader.cpp | |
| parent | badb7001612605bb631c8252d5aee30d50fb98ee (diff) | |
| parent | 2e25a48b05004112344b04cd56760709eebfc1a4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/shader.cpp')
| -rw-r--r-- | intern/cycles/render/shader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index f8bd14859f2..69f84a62a9f 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -562,10 +562,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) |