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:
authorLukas Stockner <lukas.stockner@freenet.de>2018-06-14 23:54:42 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2018-06-14 23:54:42 +0300
commit27de412ca8de4edad99a46ebdb8aadd7003e42a6 (patch)
tree4e2659e3490519021195ba626de74adc4813e825 /release/datafiles
parent525be2f579c994777328bd7ac206be4769d3e6a4 (diff)
parent3ee606621cf53a2a4897e534e7e04d3632f419f8 (diff)
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'release/datafiles')
-rw-r--r--release/datafiles/colormanagement/config.ocio6
1 files changed, 4 insertions, 2 deletions
diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio
index 71223ea828e..ce79dfeb540 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -40,6 +40,9 @@ roles:
# Non-color data
data: Non-Color
+ # CIE XYZ color space
+ XYZ: XYZ
+
displays:
sRGB:
- !<View> {name: Default, colorspace: sRGB}
@@ -188,8 +191,7 @@ colorspaces:
allocationvars: [-8.5, 5]
from_reference: !<GroupTransform>
children:
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear}
- - !<FileTransform> {src: aces_to_xyz.spimtx, interpolation: linear}
+ - !<FileTransform> {src: srgb_to_xyz.spimtx, interpolation: linear}
- !<ColorSpace>
name: rrt_xyz