griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Color Management: Tweaks to OpenColorIO config

Browse Source 
* Add ACES SDR to HDR displays
* Add ACES reference gamut compression look.
* Name non-HDR AgX for HDR displays "AgX - SDR", consistent with ACES and
  makes it more clear that this may not be the one you want for HDR. This
  required updating test blend files.
* Mark all non-sRGB view transform colorspaces as inactive, so they don't
  pollute the colorspaces list. The HDR ones were already inactive.

Ref #144911

Pull Request: https://projects.blender.org/blender/blender/pulls/145820
This commit is contained in:
Brecht Van Lommel
2025-09-07 12:14:18 +02:00
committed by Brecht Van Lommel
parent 5b6bf4743c
commit 4cb9ae813b
3 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
release/datafiles/colormanagement/config.ocio
View File

@@ -88,20 +88,22 @@ displays:
- !<View> {name: ACES 2.0 - HDR 1000 nits, colorspace: ACES 2.0 Rec.2100-PQ - HDR 1000 nits}
- !<View> {name: ACES 2.0 - HDR 2000 nits, colorspace: ACES 2.0 Rec.2100-PQ - HDR 2000 nits}
- !<View> {name: ACES 2.0 - HDR 4000 nits, colorspace: ACES 2.0 Rec.2100-PQ - HDR 4000 nits}
- !<View> {name: AgX, colorspace: AgX Rec.2100-PQ - SDR}
- !<View> {name: ACES 2.0 - SDR, colorspace: ACES 2.0 Rec.2100-PQ - SDR}
- !<View> {name: AgX - HDR 1000 nits, colorspace: AgX Rec.2100-PQ - HDR 1000 nits (P3 D65)}
- !<View> {name: AgX - SDR, colorspace: AgX Rec.2100-PQ - SDR}
- !<View> {name: False Color, colorspace: AgX False Color Rec.2100-PQ}
- !<View> {name: Raw, colorspace: Non-Color}
Rec.2100-HLG:
- !<View> {name: Standard, colorspace: Rec.2100-HLG}
- !<View> {name: ACES 2.0 - HDR 1000 nits, colorspace: ACES 2.0 Rec.2100-HLG - HDR 1000 nits}
- !<View> {name: AgX, colorspace: AgX Rec.2100-HLG - SDR}
- !<View> {name: ACES 2.0 - SDR, colorspace: ACES 2.0 Rec.2100-HLG - SDR}
- !<View> {name: AgX - HDR 1000 nits, colorspace: AgX Rec.2100-HLG - HDR 1000 nits (P3 D65)}
- !<View> {name: AgX - SDR, colorspace: AgX Rec.2100-HLG - SDR}
- !<View> {name: False Color, colorspace: AgX False Color Rec.2100-HLG}
- !<View> {name: Raw, colorspace: Non-Color}
active_displays: [sRGB, Display P3, Rec.1886, Rec.2020, Rec.2100-PQ, Rec.2100-HLG]
active_views: [Standard, ACES 2.0, ACES 2.0 - HDR 500 nits, ACES 2.0 - HDR 1000 nits, ACES 2.0 - HDR 2000 nits, ACES 2.0 - HDR 4000 nits, Khronos PBR Neutral, AgX, AgX - HDR 1000 nits, Filmic, Filmic Log, False Color, Raw]
inactive_colorspaces: [Luminance Compensation Rec.2020, AgX False Color Rec.709, AgX False Color P3, AgX False Color Rec.2020, AgX False Color Rec.2100-HLG, AgX False Color Rec.2100-PQ, ACES 2.0 Rec.2100-PQ - HDR 500 nits, ACES 2.0 Rec.2100-PQ - HDR 1000 nits, ACES 2.0 Rec.2100-PQ - HDR 2000 nits, ACES 2.0 Rec.2100-PQ - HDR 4000 nits, ACES 2.0 Rec.2020, AgX Rec.2100-HLG - HDR 1000 nits (P3 D65), AgX Rec.2100-PQ - HDR 1000 nits (P3 D65), AgX Rec.2100-HLG - SDR, AgX Rec.2100-PQ - SDR, ACES 2.0 Rec.2100-HLG - HDR 1000 nits]
active_views: [Standard, ACES 2.0, ACES 2.0 - HDR 500 nits, ACES 2.0 - HDR 1000 nits, ACES 2.0 - HDR 2000 nits, ACES 2.0 - HDR 4000 nits, ACES 2.0 - SDR, Khronos PBR Neutral, AgX, AgX - HDR 1000 nits, AgX - SDR, Filmic, Filmic Log, False Color, Raw,]
inactive_colorspaces: [Luminance Compensation Rec.2020, AgX False Color Rec.709, AgX False Color P3, AgX False Color Rec.2020, AgX False Color Rec.2100-HLG, AgX False Color Rec.2100-PQ, ACES 2.0 Rec.2100-PQ - HDR 500 nits, ACES 2.0 Rec.2100-PQ - HDR 1000 nits, ACES 2.0 Rec.2100-PQ - HDR 2000 nits, ACES 2.0 Rec.2100-PQ - HDR 4000 nits, ACES 2.0 Rec.2100-PQ - SDR, ACES 2.0 Rec.2020, AgX Rec.2100-HLG - HDR 1000 nits (P3 D65), AgX Rec.2100-PQ - HDR 1000 nits (P3 D65), AgX Rec.2100-HLG - SDR, AgX Rec.2100-PQ - SDR, ACES 2.0 Rec.2100-HLG - HDR 1000 nits, ACES 2.0 Rec.2100-HLG - SDR, AgX Base Rec.2020, AgX Base Display P3, AgX Base Rec.1886, ACES 2.0 sRGB, ACES 2.0 Display P3, ACES 2.0 Rec.1886, ACES 2.0 Rec.2020]
colorspaces:
- !<ColorSpace>
@@ -634,6 +636,21 @@ colorspaces:
- !<BuiltinTransform> {style: ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-4000nit-REC2020_2.0}
- !<BuiltinTransform> {style: DISPLAY - CIE-XYZ-D65_to_REC.2100-PQ}
- !<ColorSpace>
name: ACES 2.0 Rec.2100-PQ - SDR
family: ACES
equalitygroup:
bitdepth: 32f
description: |
ACES 2 Output Transform for 100 nit SDR Rec709
encoding: hdr-video
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: ACES2065-1}
- !<BuiltinTransform> {style: ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0}
- !<BuiltinTransform> {style: DISPLAY - CIE-XYZ-D65_to_REC.2100-PQ}
- !<ColorSpace>
name: ACES 2.0 Rec.2100-HLG - HDR 1000 nits
family: ACES
@@ -649,6 +666,21 @@ colorspaces:
- !<BuiltinTransform> {style: ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - HDR-1000nit-REC2020_2.0}
- !<BuiltinTransform> {style: DISPLAY - CIE-XYZ-D65_to_REC.2100-HLG-1000nit}
- !<ColorSpace>
name: ACES 2.0 Rec.2100-HLG - SDR
family: ACES
equalitygroup:
bitdepth: 32f
description: |
ACES 2 Output Transform for 100 nit SDR Rec709
encoding: hdr-video
isdata: false
from_scene_reference: !<GroupTransform>
children:
- !<ColorSpaceTransform> {src: Linear CIE-XYZ E, dst: ACES2065-1}
- !<BuiltinTransform> {style: ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-100nit-REC709_2.0}
- !<BuiltinTransform> {style: DISPLAY - CIE-XYZ-D65_to_REC.2100-HLG-1000nit}
- !<ColorSpace>
name: Rec.2100-PQ
aliases: [pq_rec2020_display, rec2100_pq_display, Rec.2100-PQ - Display]
@@ -998,3 +1030,9 @@ looks:
contrast: {rgb: [0.7, 0.7, 0.7], master: 1}
saturation: 1.15
pivot: {contrast: -0.2}
- !<Look>
name: ACES 2.0 - Reference Gamut Compression
process_space: ACES2065-1
description: Compress scene-referred values from common cameras into the ACEScg gamut
transform: !<BuiltinTransform> {style: ACES-LMT - ACES 1.3 Reference Gamut Compression}