diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio index bbce8c7807c..d54bfd9eb0d 100644 --- a/release/datafiles/colormanagement/config.ocio +++ b/release/datafiles/colormanagement/config.ocio @@ -18,7 +18,7 @@ luma: [0.2126, 0.7152, 0.0722] description: RRT version ut33 roles: - reference: Linear + reference: Linear CIE-XYZ E # Internal scene linear space scene_linear: Linear @@ -41,6 +41,7 @@ roles: # For interop between configs, and to determine XYZ for rendering aces_interchange: Linear ACES + cie_xyz_d65_interchange: Linear CIE-XYZ D65 # Specified by OCIO, not used in Blender color_timing: Filmic Log @@ -61,6 +62,27 @@ active_displays: [sRGB] active_views: [Standard, Filmic, Filmic Log, False Color, Raw] colorspaces: + - ! + name: Linear CIE-XYZ E + aliases: ["FilmLight: Linear - XYZ", Linear CIE-XYZ I-E] + family: Chromaticity + equalitygroup: + bitdepth: 32f + description: | + 1931 CIE XYZ standard with assumed illuminant E white point + isdata: false + + - ! + name: Linear CIE-XYZ D65 + aliases: [cie_xyz_d65, CIE-XYZ-D65, XYZ, Linear CIE-XYZ D65] + family: Chromaticity + equalitygroup: + bitdepth: 32f + description: | + 1931 CIE XYZ with adapted illuminant D65 white point + isdata: false + from_scene_reference: ! {src: xyz_E_to_D65.spimtx, interpolation: linear} + - ! name: Linear family: linear @@ -69,6 +91,10 @@ colorspaces: description: | Rec. 709 (Full Range), Blender native linear space isdata: false + from_scene_reference: ! + children: + - ! {src: Linear CIE-XYZ E, dst: Linear CIE-XYZ D65} + - ! {matrix: [ 3.2410032329763587, -1.5373989694887855, -0.4986158819963629, 0, -0.9692242522025164, 1.8759299836951759, 0.0415542263400847, 0, 0.0556394198519755, -0.2040112061239099, 1.0571489771875333, 0, 0, 0, 0, 1]} - ! name: Linear ACES @@ -80,7 +106,7 @@ colorspaces: isdata: false from_reference: ! children: - - ! {src: srgb_to_xyz.spimtx, interpolation: linear} + - ! {src: Linear CIE-XYZ E, dst: Linear CIE-XYZ D65} - ! {style: "UTILITY - ACES-AP0_to_CIE-XYZ-D65_BFD", direction: inverse} - ! @@ -93,19 +119,9 @@ colorspaces: isdata: false from_reference: ! children: - - ! {src: srgb_to_xyz.spimtx, interpolation: linear} + - ! {src: Linear CIE-XYZ E, dst: Linear CIE-XYZ D65} - ! {style: "UTILITY - ACES-AP1_to_CIE-XYZ-D65_BFD", direction: inverse} - - ! - name: XYZ - family: linear - equalitygroup: - bitdepth: 32f - isdata: false - from_reference: ! - children: - - ! {src: srgb_to_xyz.spimtx, interpolation: linear} - - ! name: sRGB family: @@ -114,7 +130,10 @@ colorspaces: description: | sRGB display space isdata: false - from_reference: ! {gamma: 2.4, offset: 0.055, direction: inverse} + from_scene_reference: ! + children: + - ! {src: Linear CIE-XYZ E, dst: Linear} + - ! {gamma: 2.4, offset: 0.055, direction: inverse} - ! name: Non-Color @@ -135,11 +154,15 @@ colorspaces: Log based filmic shaper with 16.5 stops of latitude, and 25 stops of dynamic range isdata: false from_reference: ! - children: - - ! {allocation: lg2, vars: [-12.473931188, 12.526068812]} - - ! {src: filmic_desat65cube.spi3d, interpolation: best} - - ! {allocation: uniform, vars: [0, 0.66]} - to_reference: ! {allocation: lg2, vars: [-12.473931188, 4.026068812], direction: inverse} + children: + - ! {src: Linear CIE-XYZ E, dst: Linear} + - ! {allocation: lg2, vars: [-12.473931188, 12.526068812]} + - ! {src: filmic_desat65cube.spi3d, interpolation: best} + - ! {allocation: uniform, vars: [0, 0.66]} + to_scene_reference: ! + children: + - ! {allocation: lg2, vars: [-12.473931188, 4.026068812], direction: inverse} + - ! {src: Linear CIE-XYZ E, dst: Linear, direction: inverse} - ! name: Filmic sRGB @@ -150,9 +173,9 @@ colorspaces: sRGB display space with Filmic view transform isdata: false from_reference: ! - children: - - ! {src: Linear, dst: Filmic Log} - - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear} + children: + - ! {src: Linear CIE-XYZ E, dst: Filmic Log} + - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear} - ! name: False Color @@ -163,61 +186,61 @@ colorspaces: Filmic false color view transform isdata: false from_reference: ! - children: - - ! {src: Linear, dst: Filmic Log} - - ! {matrix: [0.2126729, 0.7151521, 0.0721750, 0, 0.2126729, 0.7151521, 0.0721750, 0, 0.2126729, 0.7151521, 0.0721750, 0, 0, 0, 0, 1]} - - ! {src: filmic_false_color.spi3d, interpolation: best} + children: + - ! {src: Linear CIE-XYZ E, dst: Filmic Log} + - ! {matrix: [0.2126729, 0.7151521, 0.0721750, 0, 0.2126729, 0.7151521, 0.0721750, 0, 0.2126729, 0.7151521, 0.0721750, 0, 0, 0, 0, 1]} + - ! {src: filmic_false_color.spi3d, interpolation: best} looks: - ! name: Very High Contrast process_space: Filmic Log transform: ! - children: - - ! {src: filmic_to_1.20_1-00.spi1d, interpolation: linear} - - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} + children: + - ! {src: filmic_to_1.20_1-00.spi1d, interpolation: linear} + - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} - ! name: High Contrast process_space: Filmic Log transform: ! - children: - - ! {src: filmic_to_0.99_1-0075.spi1d, interpolation: linear} - - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} + children: + - ! {src: filmic_to_0.99_1-0075.spi1d, interpolation: linear} + - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} - ! name: Medium High Contrast process_space: Filmic Log transform: ! - children: - - ! {src: filmic_to_0-85_1-011.spi1d, interpolation: best} - - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} + children: + - ! {src: filmic_to_0-85_1-011.spi1d, interpolation: best} + - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} - ! name: Medium Contrast process_space: Filmic Log transform: ! - children: + children: - ! name: Medium Low Contrast process_space: Filmic Log transform: ! - children: - - ! {src: filmic_to_0-60_1-04.spi1d, interpolation: linear} - - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} + children: + - ! {src: filmic_to_0-60_1-04.spi1d, interpolation: linear} + - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} - ! name: Low Contrast process_space: Filmic Log transform: ! - children: - - ! {src: filmic_to_0-48_1-09.spi1d, interpolation: linear} - - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} + children: + - ! {src: filmic_to_0-48_1-09.spi1d, interpolation: linear} + - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} - ! name: Very Low Contrast process_space: Filmic Log transform: ! - children: - - ! {src: filmic_to_0-35_1-30.spi1d, interpolation: linear} - - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} + children: + - ! {src: filmic_to_0-35_1-30.spi1d, interpolation: linear} + - ! {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse} diff --git a/release/datafiles/colormanagement/luts/srgb_to_xyz.spimtx b/release/datafiles/colormanagement/luts/srgb_to_xyz.spimtx deleted file mode 100644 index decaa0e9f91..00000000000 --- a/release/datafiles/colormanagement/luts/srgb_to_xyz.spimtx +++ /dev/null @@ -1,3 +0,0 @@ -0.4124564 0.3575761 0.1804375 0 -0.2126729 0.7151522 0.0721750 0 -0.0193339 0.1191920 0.9503041 0 diff --git a/release/datafiles/colormanagement/luts/xyz_D65_to_E.spimtx b/release/datafiles/colormanagement/luts/xyz_D65_to_E.spimtx deleted file mode 100644 index 3670b94c9fe..00000000000 --- a/release/datafiles/colormanagement/luts/xyz_D65_to_E.spimtx +++ /dev/null @@ -1,3 +0,0 @@ -1.0521111 0.0000000 0.0000000 0 -0.0000000 1.0000000 0.0000000 0 -0.0000000 0.0000000 0.9184170 0 diff --git a/release/datafiles/colormanagement/luts/xyz_E_to_D65.spimtx b/release/datafiles/colormanagement/luts/xyz_E_to_D65.spimtx new file mode 100644 index 00000000000..e8d72a8b4a2 --- /dev/null +++ b/release/datafiles/colormanagement/luts/xyz_E_to_D65.spimtx @@ -0,0 +1,3 @@ +0.95318743 -0.02659057 0.02387315 0 +-0.03824666 1.02884062 0.00940604 0 +0.00260677 -0.00303325 1.08925647 0