Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/datafiles/colormanagement/config.ocio9
-rw-r--r--release/datafiles/colormanagement/luts/aces_to_xyz.spimtx3
-rw-r--r--release/datafiles/colormanagement/luts/rec709_to_aces.spimtx3
-rw-r--r--release/datafiles/colormanagement/luts/xyz_to_aces.spimtx3
4 files changed, 9 insertions, 9 deletions
diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio
index 5ad937e3efb..8da4b13df00 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -39,8 +39,8 @@ roles:
# Non-color data
data: Non-Color
- # CIE XYZ color space
- XYZ: XYZ
+ # For interop between configs, and to determine XYZ for rendering
+ aces_interchange: Linear ACES
# Specifed by OCIO, not used in Blender
color_timing: Filmic Log
@@ -97,7 +97,10 @@ colorspaces:
isdata: false
allocation: lg2
allocationvars: [-8.5, 5]
- to_reference: !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear, direction: inverse}
+ from_reference: !<GroupTransform>
+ children:
+ - !<FileTransform> {src: srgb_to_xyz.spimtx, interpolation: linear}
+ - !<FileTransform> {src: xyz_to_aces.spimtx, interpolation: linear}
- !<ColorSpace>
name: nuke_rec709
diff --git a/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx b/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx
deleted file mode 100644
index fbf52e63555..00000000000
--- a/release/datafiles/colormanagement/luts/aces_to_xyz.spimtx
+++ /dev/null
@@ -1,3 +0,0 @@
-0.9525523959 0.0000000000 0.0000936786 0
-0.3439664498 0.7281660966 -0.072132546 0
-0.0000000000 0.0000000000 1.0088251844 0
diff --git a/release/datafiles/colormanagement/luts/rec709_to_aces.spimtx b/release/datafiles/colormanagement/luts/rec709_to_aces.spimtx
deleted file mode 100644
index 0f4f6bd68b4..00000000000
--- a/release/datafiles/colormanagement/luts/rec709_to_aces.spimtx
+++ /dev/null
@@ -1,3 +0,0 @@
-0.4395770431 0.3839148879 0.1765103489 0.0
-0.0895979404 0.8147120476 0.0956883803 0.0
-0.0174174830 0.1087378338 0.8738504052 0.0
diff --git a/release/datafiles/colormanagement/luts/xyz_to_aces.spimtx b/release/datafiles/colormanagement/luts/xyz_to_aces.spimtx
new file mode 100644
index 00000000000..18bc78f5e63
--- /dev/null
+++ b/release/datafiles/colormanagement/luts/xyz_to_aces.spimtx
@@ -0,0 +1,3 @@
+ 1.0498110175 0.0000000000 -0.0000974845 0
+-0.4959030231 1.3733130458 0.0982400361 0
+ 0.0000000000 0.0000000000 0.9912520182 0