diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-25 12:48:31 +0300 |
| commit | e76ff4df4123b5517599930629dbcf0507b582e9 (patch) | |
| tree | 3cf9a67f3a3a05c678f39a04533da81f56e66c02 /source/blender/imbuf/IMB_colormanagement.h | |
| parent | 15dd6cb66887eb83fcc3ecf44c3b42a53161e390 (diff) | |
| parent | 528f0b95c4462b2e429600a566ca0434c90310f6 (diff) | |
Merge branch 'master' into tmp-widget-optitmp-widget-opti
# Conflicts:
# source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
Diffstat (limited to 'source/blender/imbuf/IMB_colormanagement.h')
| -rw-r--r-- | source/blender/imbuf/IMB_colormanagement.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index 1639fb4715f..3158e3419b0 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -56,6 +56,7 @@ void IMB_colormanagement_validate_settings( const char *IMB_colormanagement_role_colorspace_name_get(int role); void IMB_colormanagement_check_is_data(struct ImBuf *ibuf, const char *name); +void IMB_colormanagegent_copy_settings(struct ImBuf *ibuf_src, struct ImBuf *ibuf_dst); void IMB_colormanagement_assign_float_colorspace(struct ImBuf *ibuf, const char *name); void IMB_colormanagement_assign_rect_colorspace(struct ImBuf *ibuf, const char *name); |