diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-03-09 17:38:17 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-03-23 17:21:58 +0300 |
commit | 7aab508e3273ae1762ae815bbecc8842938f0926 (patch) | |
tree | 94a0199e9eba3aea9da93cec1a4e053c2b61ffda /source/blender/makesdna | |
parent | 51727fe86fdeb1f01552afdac5a5d7b7ad4453b5 (diff) |
Color Management: support different settings for render and compositing output
The Output Properties > Output panel now has a Color Management subpanel to
override scene settings. When set to Override instead of Follow Scene, there
are settings to:
* For OpenEXR, choose a (linear) colorspace for RGBA passes
* For other file formats, use different display/view/look/exposure/gamma
These settings affect animation render output, image save of renders and the
compositor file output node. Additionally, the image save operator and
compositor file output nodes also support overriding color management.
Includes some layout changes to the relevant panels to accomdate the new
settings and to improve consistency. Ideally subpanels would be used to better
organize these settings, however nodes and operators don't currently support
creating subpanels.
Differential Revision: https://developer.blender.org/D14402
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index be8f9f938a3..24c120ae860 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -429,6 +429,8 @@ typedef struct ImageFormatData { Stereo3dFormat stereo3d_format; /* color management */ + char color_management; + char _pad1[7]; ColorManagedViewSettings view_settings; ColorManagedDisplaySettings display_settings; ColorManagedColorspaceSettings linear_colorspace_settings; @@ -527,6 +529,10 @@ enum { R_IMF_TIFF_CODEC_NONE = 3, }; +/** #ImageFormatData.color_management */ +#define R_IMF_COLOR_MANAGEMENT_FOLLOW_SCENE 0 +#define R_IMF_COLOR_MANAGEMENT_OVERRIDE 1 + typedef struct BakeData { struct ImageFormatData im_format; |