Merge branch 'blender-v2.83-release'

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}