diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-11-16 14:55:50 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-11-16 14:55:50 +0300 |
| commit | 8b88739848673ab16d585aafb1ac5fcae27c1826 (patch) | |
| tree | 0f3975345126e7a040f4d15e4382c55b89a6357b /source/blender/imbuf/intern/colormanagement.c | |
| parent | cb9f6dfebdfb6742257218eb952e3cae44a6a2b2 (diff) | |
| parent | 7db42b8f2a8cdec5067f2fe73082bd5d806a5e42 (diff) | |
Merge branch 'blender-v2.91-release' into master
Diffstat (limited to 'source/blender/imbuf/intern/colormanagement.c')
| -rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 9dced926dcc..2c95d49612f 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -4038,7 +4038,7 @@ static void curve_mapping_to_ocio_settings(CurveMapping *curve_mapping, copy_v3_v3(curve_mapping_settings->black, curve_mapping->black); copy_v3_v3(curve_mapping_settings->bwmul, curve_mapping->bwmul); - curve_mapping_settings->cache_id = (size_t)curve_mapping; + curve_mapping_settings->cache_id = (size_t)curve_mapping + curve_mapping->changed_timestamp; } static void update_glsl_display_processor(const ColorManagedViewSettings *view_settings, |