blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release' into master

This commit is contained in:
Philipp Oeser 2020-11-16 12:55:50 +01:00
parent cb9f6dfebd 7db42b8f2a
commit 8b88739848
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/imbuf/intern/colormanagement.c
View File

@ -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,