diff options
-rw-r--r-- | intern/cycles/blender/blender_light.cpp | 1 | ||||
-rw-r--r-- | intern/cycles/render/scene.cpp | 4 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_math_color_blend.h | 8 |
3 files changed, 4 insertions, 9 deletions
diff --git a/intern/cycles/blender/blender_light.cpp b/intern/cycles/blender/blender_light.cpp index 5351de2e84b..6f95821e31e 100644 --- a/intern/cycles/blender/blender_light.cpp +++ b/intern/cycles/blender/blender_light.cpp @@ -210,4 +210,3 @@ void BlenderSync::sync_background_light(BL::SpaceView3D &b_v3d, bool use_portal) } CCL_NAMESPACE_END - diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 4f7d886cb10..24469620840 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -356,8 +356,8 @@ bool Scene::need_update() bool Scene::need_data_update() { return (background->need_update || image_manager->need_update || object_manager->need_update || - geometry_manager->need_update || light_manager->need_update || lookup_tables->need_update || - integrator->need_update || shader_manager->need_update || + geometry_manager->need_update || light_manager->need_update || + lookup_tables->need_update || integrator->need_update || shader_manager->need_update || particle_system_manager->need_update || curve_system_manager->need_update || bake_manager->need_update || film->need_update); } diff --git a/source/blender/blenlib/BLI_math_color_blend.h b/source/blender/blenlib/BLI_math_color_blend.h index a3efb5d72e9..47bafff3a49 100644 --- a/source/blender/blenlib/BLI_math_color_blend.h +++ b/source/blender/blenlib/BLI_math_color_blend.h @@ -69,9 +69,7 @@ MINLINE void blend_color_overlay_byte(unsigned char dst[4], MINLINE void blend_color_hardlight_byte(unsigned char dst[4], const uchar src1[4], const uchar src2[4]); -MINLINE void blend_color_burn_byte(unsigned char dst[4], - const uchar src1[4], - const uchar src2[4]); +MINLINE void blend_color_burn_byte(unsigned char dst[4], const uchar src1[4], const uchar src2[4]); MINLINE void blend_color_linearburn_byte(unsigned char dst[4], const uchar src1[4], const uchar src2[4]); @@ -102,9 +100,7 @@ MINLINE void blend_color_exclusion_byte(unsigned char dst[4], MINLINE void blend_color_color_byte(unsigned char dst[4], const uchar src1[4], const uchar src2[4]); -MINLINE void blend_color_hue_byte(unsigned char dst[4], - const uchar src1[4], - const uchar src2[4]); +MINLINE void blend_color_hue_byte(unsigned char dst[4], const uchar src1[4], const uchar src2[4]); MINLINE void blend_color_saturation_byte(unsigned char dst[4], const uchar src1[4], const uchar src2[4]); |