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/nodes | |
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/nodes')
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_output_file.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_output_file.cc b/source/blender/nodes/composite/nodes/node_composite_output_file.cc index 28de1f48b79..1fd6e62b4c5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_output_file.cc +++ b/source/blender/nodes/composite/nodes/node_composite_output_file.cc @@ -303,7 +303,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0; node_composit_buts_file_output(layout, C, ptr); - uiTemplateImageSettings(layout, &imfptr, false); + uiTemplateImageSettings(layout, &imfptr, true); /* disable stereo output for multilayer, too much work for something that no one will use */ /* if someone asks for that we can implement it */ @@ -422,12 +422,16 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi ICON_NONE); } - col = uiLayoutColumn(layout, false); - uiLayoutSetActive(col, use_node_format == false); - uiTemplateImageSettings(col, &imfptr, false); + if (!use_node_format) { + const bool use_color_management = RNA_boolean_get(&active_input_ptr, "save_as_render"); - if (is_multiview) { - uiTemplateImageFormatViews(layout, &imfptr, nullptr); + col = uiLayoutColumn(layout, false); + uiTemplateImageSettings(col, &imfptr, use_color_management); + + if (is_multiview) { + col = uiLayoutColumn(layout, false); + uiTemplateImageFormatViews(col, &imfptr, nullptr); + } } } } |