Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 6 Nov 2018 19:04:06 +0000 (20:04 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 6 Nov 2018 19:04:06 +0000 (20:04 +0100)
1  2 
release/datafiles/colormanagement/config.ocio

index c8466ab99fc25486e385eb9f75d8cc885960ad61,6c934cfbe44fcc69b4d18553d0186c2d5741dd46..bba5958769d96a3444977aee415bc26b59f2a79d
@@@ -70,7 -70,7 +70,7 @@@ displays
      - !<View> {name: Default, colorspace: Raw}
  
  active_displays: [sRGB, DCIP3, Rec709, XYZ, None]
 -active_views: [Default, RRT, Raw, Log]
 +active_views: [Filmic, Default, RRT, Raw, Log]
  
  colorspaces:
    - !<ColorSpace>
@@@ -82,7 -82,7 +82,7 @@@
        Rec. 709 (Full Range), Blender native linear space
      isdata: false
      allocation: lg2
-     allocationvars: [-15, 6]
+     allocationvars: [-12.473931188, 12.526068812]
  
    - !<ColorSpace>
      name: Raw