Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Jun 2018 14:32:31 +0000 (16:32 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Jun 2018 14:32:31 +0000 (16:32 +0200)
1  2 
intern/cycles/render/shader.cpp

@@@ -207,7 -207,6 +207,7 @@@ Shader::Shader(
  
        need_update = true;
        need_update_mesh = true;
 +      need_sync_object = false;
  }
  
  Shader::~Shader()
@@@ -562,10 -561,10 +562,10 @@@ void ShaderManager::device_update_commo
        /* 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)