Changeset View
Changeset View
Standalone View
Standalone View
source/blender/imbuf/intern/colormanagement.c
| Show First 20 Lines • Show All 4,032 Lines • ▼ Show 20 Lines | for (i = 0; i < 4; i++) { | ||||
| curve_mapping_settings->first_y[i] = cuma->table[0].y; | curve_mapping_settings->first_y[i] = cuma->table[0].y; | ||||
| curve_mapping_settings->last_x[i] = cuma->table[CM_TABLE].x; | curve_mapping_settings->last_x[i] = cuma->table[CM_TABLE].x; | ||||
| curve_mapping_settings->last_y[i] = cuma->table[CM_TABLE].y; | curve_mapping_settings->last_y[i] = cuma->table[CM_TABLE].y; | ||||
| } | } | ||||
| copy_v3_v3(curve_mapping_settings->black, curve_mapping->black); | copy_v3_v3(curve_mapping_settings->black, curve_mapping->black); | ||||
| copy_v3_v3(curve_mapping_settings->bwmul, curve_mapping->bwmul); | 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; | ||||
jbakker: Size_t seems incorrect now. Perhaps create a function to calc the cached and use a different… | |||||
jbakkerUnsubmitted Done Inline ActionsNot important as it is only used here. jbakker: Not important as it is only used here. | |||||
| } | } | ||||
| static void update_glsl_display_processor(const ColorManagedViewSettings *view_settings, | static void update_glsl_display_processor(const ColorManagedViewSettings *view_settings, | ||||
| const ColorManagedDisplaySettings *display_settings, | const ColorManagedDisplaySettings *display_settings, | ||||
| const char *from_colorspace) | const char *from_colorspace) | ||||
| { | { | ||||
| bool use_curve_mapping = (view_settings->flag & COLORMANAGE_VIEW_USE_CURVES) != 0; | bool use_curve_mapping = (view_settings->flag & COLORMANAGE_VIEW_USE_CURVES) != 0; | ||||
| bool need_update = false; | bool need_update = false; | ||||
| ▲ Show 20 Lines • Show All 184 Lines • Show Last 20 Lines | |||||
Size_t seems incorrect now. Perhaps create a function to calc the cached and use a different type.