[Bf-blender-cvs] [3cd27374ee5] master: Color management: add Filmic view transform to Blender configuration.
Brecht Van Lommel
noreply at git.blender.org
Sun May 7 16:52:21 CEST 2017
Commit: 3cd27374ee53bc2ae3fd08b0b73c0a3118f81020
Author: Brecht Van Lommel
Date: Sun May 7 16:41:38 2017 +0200
Branches: master
https://developer.blender.org/rB3cd27374ee53bc2ae3fd08b0b73c0a3118f81020
Color management: add Filmic view transform to Blender configuration.
* "Filmic" and "False Color" view transforms added (sRGB display device only).
* "Very Low/Low/Base/High/Very High Contrast" looks added.
* Added filtering so that Filmic only shows look names prefixed with "Filmic - ".
Filmic Dynamic Range LUT configuration created by Troy James Sobotka with
special thanks and feedback from Guillermo, Claudio Rocha, Bassam Kurdali,
Eugenio Pignataro, Henri Hebeisen, Jason Clarke, Haarm-Peter Duiker, Thomas
Mansencal, and Timothy Lottes.
Differential Revision: https://developer.blender.org/D2659
===================================================================
M release/datafiles/colormanagement/config.ocio
A release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d
A release/datafiles/colormanagement/filmic/filmic_false_color.spi3d
A release/datafiles/colormanagement/filmic/filmic_to_0-35_1-30.spi1d
A release/datafiles/colormanagement/filmic/filmic_to_0-48_1-09.spi1d
A release/datafiles/colormanagement/filmic/filmic_to_0-60_1-04.spi1d
A release/datafiles/colormanagement/filmic/filmic_to_0-70_1-03.spi1d
A release/datafiles/colormanagement/filmic/filmic_to_0-85_1-011.spi1d
A release/datafiles/colormanagement/filmic/filmic_to_0.99_1-0075.spi1d
A release/datafiles/colormanagement/filmic/filmic_to_1.20_1-00.spi1d
M source/blender/imbuf/IMB_colormanagement.h
M source/blender/imbuf/intern/IMB_colormanagement_intern.h
M source/blender/imbuf/intern/colormanagement.c
M source/blender/makesrna/intern/rna_color.c
===================================================================
diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio
index 924a140d6f3..5bed23cf210 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -2,11 +2,16 @@
#
# Based on aces, nuke-default and spi configurations from OpenColorIO-Config
#
+# Filmic Dynamic Range LUT configuration crafted by Troy James Sobotka with
+# special thanks and feedback from Guillermo, Claudio Rocha, Bassam Kurdali,
+# Eugenio Pignataro, Henri Hebeisen, Jason Clarke, Haarm-Peter Duiker, Thomas
+# Mansencal, and Timothy Lottes.
+#
# See ocio-license.txt for details.
ocio_profile_version: 1
-search_path: luts
+search_path: "luts:filmic"
strictparsing: true
luma: [0.2126, 0.7152, 0.0722]
@@ -17,6 +22,7 @@ roles:
# Internal scene linear space
scene_linear: Linear
+ rendering: Linear
# Default color space for byte image
default_byte: sRGB
@@ -31,13 +37,18 @@ roles:
color_picking: Raw
texture_paint: Raw
+ # Non-color data
+ data: Non-Color
+
displays:
sRGB:
- !<View> {name: Default, colorspace: sRGB}
+ - !<View> {name: Filmic, colorspace: Filmic sRGB}
- !<View> {name: RRT, colorspace: rrt_srgb}
- !<View> {name: Film, colorspace: srgb8}
- !<View> {name: Raw, colorspace: Raw}
- !<View> {name: Log, colorspace: lg10}
+ - !<View> {name: False Color, colorspace: False Color}
DCI-P3:
- !<View> {name: RRT, colorspace: rrt_p3dci}
- !<View> {name: Film, colorspace: p3dci8}
@@ -61,7 +72,7 @@ active_views: [Default, RRT, Raw, Log]
colorspaces:
- !<ColorSpace>
name: Linear
- family: aces
+ family: linear
equalitygroup:
bitdepth: 32f
description: |
@@ -101,7 +112,7 @@ colorspaces:
- !<ColorSpace>
name: Linear ACES
- family:
+ family: linear
equalitygroup:
bitdepth: 32f
description: |
@@ -113,7 +124,7 @@ colorspaces:
- !<ColorSpace>
name: rrt_srgb
- family: rrt
+ family: display
equalitygroup:
bitdepth: 32f
isdata: false
@@ -141,7 +152,7 @@ colorspaces:
- !<ColorSpace>
name: rrt_rec709
- family: rrt
+ family: display
equalitygroup:
bitdepth: 32f
isdata: false
@@ -155,7 +166,7 @@ colorspaces:
- !<ColorSpace>
name: rrt_p3dci
- family: rrt
+ family: display
equalitygroup:
bitdepth: 32f
isdata: false
@@ -169,7 +180,7 @@ colorspaces:
- !<ColorSpace>
name: XYZ
- family:
+ family: linear
equalitygroup:
bitdepth: 32f
isdata: false
@@ -182,7 +193,7 @@ colorspaces:
- !<ColorSpace>
name: rrt_xyz
- family: rrt
+ family: display
equalitygroup:
bitdepth: 32f
isdata: false
@@ -287,8 +298,108 @@ colorspaces:
- !<ColorSpaceTransform> {src: Linear, dst: lg10}
- !<FileTransform> {src: colorworks_filmlg_to_p3.3dl, interpolation: linear}
+ - !<ColorSpace>
+ name: Filmic Log
+ family: log
+ equalitygroup:
+ bitdepth: 32f
+ description: |
+ Log based filmic shaper with 16.5 stops of latitude, and 25 stops of dynamic range.
+ isdata: false
+ allocation: lg2
+ allocationvars: [-12.473931188, 12.526068812]
+ from_reference: !<GroupTransform>
+ children:
+ - !<AllocationTransform> {allocation: lg2, vars: [-12.473931188, 12.526068812]}
+ - !<FileTransform> {src: filmic_desat65cube.spi3d, interpolation: best}
+ - !<AllocationTransform> {allocation: uniform, vars: [0, 0.66]}
+ to_reference: !<AllocationTransform> {allocation: lg2, vars: [-12.473931188, 4.026068812], direction: inverse}
+
+ - !<ColorSpace>
+ name: Filmic sRGB
+ family: display
+ equalitygroup:
+ bitdepth: 32f
+ description: |
+ Filmic sRGB view transform
+ isdata: false
+ allocation: lg2
+ allocationvars: [-12.473931188, 12.526068812]
+ from_reference: !<GroupTransform>
+ children:
+ - !<ColorSpaceTransform> {src: Linear, dst: Filmic Log}
+ - !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear}
+
+ - !<ColorSpace>
+ name: False Color
+ family: display
+ equalitygroup:
+ bitdepth: 32f
+ description: |
+ Filmic false color view transform
+ isdata: false
+ allocation: lg2
+ allocationvars: [-12.473931188, 12.526068812]
+ from_reference: !<GroupTransform>
+ children:
+ - !<ColorSpaceTransform> {src: Linear, dst: Filmic Log}
+ - !<FileTransform> {src: filmic_false_color.spi3d, interpolation: best}
looks:
- !<Look>
+ name: Filmic - Very High Contrast
+ process_space: Filmic Log
+ transform: !<GroupTransform>
+ children:
+ - !<FileTransform> {src: filmic_to_1.20_1-00.spi1d, interpolation: linear}
+ - !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse}
+
+ - !<Look>
+ name: Filmic - High Contrast
+ process_space: Filmic Log
+ transform: !<GroupTransform>
+ children:
+ - !<FileTransform> {src: filmic_to_0.99_1-0075.spi1d, interpolation: linear}
+ - !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse}
+
+ - !<Look>
+ name: Filmic - Medium High Contrast
+ process_space: Filmic Log
+ transform: !<GroupTransform>
+ children:
+ - !<FileTransform> {src: filmic_to_0-85_1-011.spi1d, interpolation: best}
+ - !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse}
+
+ - !<Look>
+ name: Filmic - Base Contrast
+ process_space: Filmic Log
+ transform: !<GroupTransform>
+ children:
+
+ - !<Look>
+ name: Filmic - Medium Low Contrast
+ process_space: Filmic Log
+ transform: !<GroupTransform>
+ children:
+ - !<FileTransform> {src: filmic_to_0-60_1-04.spi1d, interpolation: linear}
+ - !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse}
+
+ - !<Look>
+ name: Filmic - Low Contrast
+ process_space: Filmic Log
+ transform: !<GroupTransform>
+ children:
+ - !<FileTransform> {src: filmic_to_0-48_1-09.spi1d, interpolation: linear}
+ - !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse}
+
+ - !<Look>
+ name: Filmic - Very Low Contrast
+ process_space: Filmic Log
+ transform: !<GroupTransform>
+ children:
+ - !<FileTransform> {src: filmic_to_0-35_1-30.spi1d, interpolation: linear}
+ - !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse}
+
+ - !<Look>
name: Agfa Agfacolor Futura 100
process_space: linear
transform: !<GroupTransform>
diff --git a/release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d b/release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d
new file mode 100644
index 00000000000..bd80dd4eae0
--- /dev/null
+++ b/release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d
@@ -0,0 +1,274628 @@
+SPILUT 1.0
+3 3
+65 65 65
+0 0 0 0.000175781 0.000175781 0.000175781
+0 0 1 0.000175781 0.000175781 0.015625
+0 0 2 0.000175781 0.000175781 0.03125
+0 0 3 0.000175781 0.000175781 0.046875
+0 0 4 0.000175781 0.000175781 0.0625
+0 0 5 0.000175781 0.000175781 0.078125
+0 0 6 0.000175781 0.000175781 0.09375
+0 0 7 0.000175781 0.000175781 0.109375
+0 0 8 0.000175781 0.000175781 0.125
+0 0 9 0.000175781 0.000175781 0.140625
+0 0 10 0.000175781 0.000175781 0.15625
+0 0 11 0.000175781 0.000175781 0.171875
+0 0 12 0.000175781 0.000175781 0.1875
+0 0 13 0.000175781 0.000175781 0.203125
+0 0 14 0.000175781 0.000175781 0.21875
+0 0 15 0.000175781 0.000175781 0.234375
+0 0 16 0.000175781 0.000175781 0.25
+0 0 17 0.000175781 0.000175781 0.265625
+0 0 18 0.000175781 0.000175781 0.28125
+0 0 19 0.000175781 0.000175781 0.296875
+0 0 20 0.000175781 0.000175781 0.3125
+0 0 21 0.000175781 0.000175781 0.328125
+0 0 22 0.000175781 0.000175781 0.34375
+0 0 23 0.000175781 0.000175781 0.359375
+0 0 24 0.000175781 0.000175781 0.375
+0 0 25 0.000175781 0.000175781 0.390625
+0 0 26 0.000175781 0.000175781 0.40625
+0 0 27 0.000175781 0.000175781 0.421875
+0 0 28 0.000175781 0.000175781 0.4375
+0 0 29 0.000175781 0.000175781 0.453125
+0 0 30 0.000175781 0.000175781 0.46875
+0 0 31 0.000175781 0.000175781 0.484375
+0 0 32 0.000175781 0.000175781 0.5
+0 0 33 0.000175781 0.000175781 0.515625
+0 0 34 0.000175781 0.000175781 0.53125
+0 0 35 0.000175781 0.000175781 0.546875
+0 0 36 0.000175781 0.000175781 0.5625
+0 0 37 0.000175781 0.000175781 0.578125
+0 0 38 0.000175781 0.000175781 0.59375
+0 0 39 0.000175781 0.000175781 0.609375
+0 0 40 0.000175781 0.000175781 0.625
+0 0 41 0.0228018 0.0228018 0.640625
+0 0 42 0.19122 0.19122 0.65625
+0 0 43 0.257329 0.257329 0.671875
+0 0 44 0.307455 0.307455 0.6875
+0 0 45 0.350929 0.350929 0.703125
+0 0 46 0.390838 0.390838 0.71875
+0 0 47 0.428586 0.428586 0.734375
+0 0 48 0.464927 0.464927 0.75
+0 0 49 0.500307 0.500307 0.765625
+0 0 50 0.535012 0.535012 0.78125
+0 0 51 0.569232 0.569232 0.796875
+0 0 52 0.603098 0.603098 0.8125
+0 0 53 0.636703 0.636703 0.828125
+0 0 54 0.670113 0.670113 0.84375
+0 0 55 0.703378 0.703378 0.859375
+0 0 56 0.736533 0.736533 0.875
+0 0 57 0.769606 0.769606 0.890625
+0 0 58 0.802617 0.802617 0.90625
+0 0 59 0.83558 0.83558 0.921875
+0 0 60 0.868507 0.868507 0.9375
+0 0 61 0.901407 0.901407 0.953125
+0 0 62 0.934286 0.934286 0.96875
+0 0 63 0.967149 0.967149 0.984375
+0 0 64 1 1 1
+0 1 0 0.000175781 0.015625 0.000175781
+0 1 1 0.000175781 0.015625 0.015625
+0 1 2 0.000175781 0.015625 0.03125
+0 1 3 0.000175781 0.015625 0.046875
+0 1 4 0.000175781 0.015625 0.0625
+0 1 5 0.000175781 0.015625 0.078125
+0 1 6 0.000175781 0.015625 0.09375
+0 1 7 0.000175781 0.015625 0.109375
+0 1 8 0.000175781 0.015625 0.125
+0 1 9 0.000175781 0.015625 0.140625
+0 1 10 0.000175781 0.015625 0.15625
+0 1 11 0.000175781 0.015625 0.171875
+0 1 12 0.000175781 0.015625 0.1875
+0 1 13 0.000175781 0.015625 0.203125
+0 1 14 0.000175781 0.015625 0.21875
+0 1 15 0.000175781 0.015625 0.234375
+0 1 16 0.000175781 0.0156
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list