diff options
author | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
commit | 920a58d9b6d667894cf166cbbd25e4c2fbd238ea (patch) | |
tree | 7ca5a9da640753b5e070c439ac3bdd14dfad92cf /release/datafiles/colormanagement/config.ocio | |
parent | c94b6209861ca7cc3985b53474feed7d94c0221a (diff) | |
parent | a1d55bdd530390e58c51abe9707b8d3b0ae3e861 (diff) |
Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite
Diffstat (limited to 'release/datafiles/colormanagement/config.ocio')
-rw-r--r-- | release/datafiles/colormanagement/config.ocio | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio index c224c2c3c2d..5ad937e3efb 100644 --- a/release/datafiles/colormanagement/config.ocio +++ b/release/datafiles/colormanagement/config.ocio @@ -33,9 +33,8 @@ roles: # Default color space sequencer is working in default_sequencer: sRGB - # Color spaces for color picking and texture painting (not internally supported yet) + # Distribution of colors in color picker color_picking: sRGB - texture_paint: Raw # Non-color data data: Non-Color @@ -43,6 +42,13 @@ roles: # CIE XYZ color space XYZ: XYZ + # Specifed by OCIO, not used in Blender + color_timing: Filmic Log + compositing_log: Filmic Log + default: Linear + matte_paint: Linear + texture_paint: Linear + displays: sRGB: - !<View> {name: Standard, colorspace: sRGB} |