[Bf-blender-cvs] [d2e139e44e0] master: Color Management: update configuration, remove legacy transforms
Brecht Van Lommel
noreply at git.blender.org
Mon May 20 16:40:34 CEST 2019
Commit: d2e139e44e0a3b70ae3b517c7b8f2449d3d1620c
Author: Brecht Van Lommel
Date: Sun May 5 17:20:19 2019 +0200
Branches: master
https://developer.blender.org/rBd2e139e44e0a3b70ae3b517c7b8f2449d3d1620c
Color Management: update configuration, remove legacy transforms
* Replace Log view transform with Filmic Log.
* Remove Rec.709, DCI-P3 displays that were incomplete and outdated.
* Remove outdated RRT and Film transforms, replaced by Filmic.
* Remove camera responsive curves that don't work with HDR colors.
* Rename Default view transform to Standard.
We're breaking compatibility now for 2.80, so that we can add future
improvements on a clean config.
Part of the code was contributed by George Vogiatzis in D4782.
Differential Revision: https://developer.blender.org/D4900
===================================================================
M intern/opencolorio/fallback_impl.cc
M release/datafiles/colormanagement/config.ocio
D release/datafiles/colormanagement/luts/adx_adx10_to_cdd.spimtx
D release/datafiles/colormanagement/luts/adx_cdd_to_cid.spimtx
D release/datafiles/colormanagement/luts/adx_cid_to_rle.spi1d
D release/datafiles/colormanagement/luts/adx_exp_to_aces.spimtx
D release/datafiles/colormanagement/luts/colorworks_filmlg_to_p3.3dl
D release/datafiles/colormanagement/luts/film_response/agfa_advantix_100.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_advantix_200.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_advantix_400.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_ct_precisa_100.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_ct_precisa_200.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_050.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_100.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_200.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_100.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_200.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_400.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_100.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_200.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_400.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_100_plus.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_200_plus.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_400_plus.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_optima_ii_100.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_optima_ii_200.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_ultra_050.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_100.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_200.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_400.spi1d
D release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_800.spi1d
D release/datafiles/colormanagement/luts/film_response/canon_optura_981111.slrr.spi1d
D release/datafiles/colormanagement/luts/film_response/canon_optura_981111.spi1d
D release/datafiles/colormanagement/luts/film_response/canon_optura_981113.spi1d
D release/datafiles/colormanagement/luts/film_response/canon_optura_981114.spi1d
D release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_12min.spi1d
D release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_4min.spi1d
D release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_5min.spi1d
D release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_6min.spi1d
D release/datafiles/colormanagement/luts/film_response/fujifilm_f-125.spi1d
D release/datafiles/colormanagement/luts/film_response/fujifilm_f-250.spi1d
D release/datafiles/colormanagement/luts/film_response/fujifilm_f-400.spi1d
D release/datafiles/colormanagement/luts/film_response/fujifilm_fci.spi1d
D release/datafiles/colormanagement/luts/film_response/fujifilm_fp2900z.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_dscs_3151.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_dscs_3152.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_dscs_3153.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_dscs_3154.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_dscs_3155.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_dscs_3156.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_100.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_100_plus.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_320t.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_400x.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_64.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_64t.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_e100s.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_gold_100.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_gold_200.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_kaf-2001.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_kaf-3000.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_kai-0311.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_kai-0372.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_kai-1010.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_200.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_25.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_64.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_max_zoom_800.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_portra_100t.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_portra_160nc.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_portra_160vc.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_portra_400nc.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_portra_400vc.spi1d
D release/datafiles/colormanagement/luts/film_response/kodak_portra_800.spi1d
D release/datafiles/colormanagement/luts/rrt_ut33_dcdm.spi3d
D release/datafiles/colormanagement/luts/rrt_ut33_p3dci.spi3d
D release/datafiles/colormanagement/luts/rrt_ut33_rec709.spi3d
D release/datafiles/colormanagement/luts/rrt_ut33_sRGB.spi3d
D release/datafiles/colormanagement/luts/spi_ocio_srgb_test.spi3d
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/imbuf/intern/colormanagement.c
M source/blender/makesrna/intern/rna_color.c
===================================================================
diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc
index dbf56136d8a..ec63dccf147 100644
--- a/intern/opencolorio/fallback_impl.cc
+++ b/intern/opencolorio/fallback_impl.cc
@@ -283,7 +283,7 @@ const char *FallbackImpl::configGetDisplay(OCIO_ConstConfigRcPtr * /*config*/, i
const char *FallbackImpl::configGetDefaultView(OCIO_ConstConfigRcPtr * /*config*/,
const char * /*display*/)
{
- return "Default";
+ return "Standard";
}
int FallbackImpl::configGetNumViews(OCIO_ConstConfigRcPtr * /*config*/, const char * /*display*/)
@@ -296,7 +296,7 @@ const char *FallbackImpl::configGetView(OCIO_ConstConfigRcPtr * /*config*/,
int index)
{
if (index == 0) {
- return "Default";
+ return "Standard";
}
return NULL;
}
diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio
index e9663382b04..54ebec90733 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -45,32 +45,20 @@ roles:
displays:
sRGB:
- - !<View> {name: Default, colorspace: sRGB}
+ - !<View> {name: Standard, colorspace: sRGB}
- !<View> {name: Filmic, colorspace: Filmic sRGB}
- - !<View> {name: RRT, colorspace: rrt_srgb}
- - !<View> {name: Film, colorspace: srgb8}
+ - !<View> {name: Filmic Log, colorspace: Filmic Log}
- !<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}
- - !<View> {name: Raw, colorspace: Raw}
- - !<View> {name: Log, colorspace: adx10}
- Rec709:
- - !<View> {name: Default, colorspace: nuke_rec709}
- - !<View> {name: RRT, colorspace: rrt_rec709}
XYZ:
- - !<View> {name: Default, colorspace: XYZ}
- - !<View> {name: RRT, colorspace: rrt_xyz}
+ - !<View> {name: Standard, colorspace: XYZ}
- !<View> {name: DCI, colorspace: dci_xyz}
- !<View> {name: Raw, colorspace: Raw}
- - !<View> {name: Log, colorspace: adx10}
None:
- - !<View> {name: Default, colorspace: Raw}
+ - !<View> {name: Standard, colorspace: Raw}
-active_displays: [sRGB, DCIP3, Rec709, XYZ, None]
-active_views: [Default, Filmic, RRT, Raw, Log]
+active_displays: [sRGB, XYZ, None]
+active_views: [Standard, Filmic, Filmic Log, Raw]
colorspaces:
- !<ColorSpace>
@@ -93,26 +81,6 @@ colorspaces:
allocation: uniform
allocationvars: [0, 1]
- - !<ColorSpace>
- name: adx10
- family: display
- equalitygroup:
- bitdepth: 10ui
- description: |
- Film Scan, using the 10-bit Academy Density Encoding
-
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- to_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: adx_adx10_to_cdd.spimtx}
- - !<FileTransform> {src: adx_cdd_to_cid.spimtx}
- - !<FileTransform> {src: adx_cid_to_rle.spi1d, interpolation: linear}
- - !<LogTransform> {base: 10, direction: inverse}
- - !<FileTransform> {src: adx_exp_to_aces.spimtx}
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear, direction: inverse}
-
- !<ColorSpace>
name: Linear ACES
family: linear
@@ -125,20 +93,6 @@ colorspaces:
allocationvars: [-8.5, 5]
to_reference: !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear, direction: inverse}
- - !<ColorSpace>
- name: rrt_srgb
- family: display
- equalitygroup:
- bitdepth: 32f
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- from_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
- - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_sRGB.spi3d, interpolation: tetrahedral}
-
- !<ColorSpace>
name: nuke_rec709
family: display
@@ -153,34 +107,6 @@ colorspaces:
children:
- !<FileTransform> {src: rec709.spi1d, interpolation: linear}
- - !<ColorSpace>
- name: rrt_rec709
- family: display
- equalitygroup:
- bitdepth: 32f
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- from_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
- - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_rec709.spi3d, interpolation: tetrahedral}
-
- - !<ColorSpace>
- name: rrt_p3dci
- family: display
- equalitygroup:
- bitdepth: 32f
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- from_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
- - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_p3dci.spi3d, interpolation: tetrahedral}
-
- !<ColorSpace>
name: XYZ
family: linear
@@ -193,20 +119,6 @@ colorspaces:
children:
- !<FileTransform> {src: srgb_to_xyz.spimtx, interpolation: linear}
- - !<ColorSpace>
- name: rrt_xyz
- family: display
- equalitygroup:
- bitdepth: 32f
- isdata: false
- allocation: uniform
- allocationvars: [0, 1]
- from_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
- - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
- - !<FileTransform> {src: rrt_ut33_dcdm.spi3d, interpolation: tetrahedral}
-
- !<ColorSpace>
name: dci_xyz
family: display
@@ -235,20 +147,6 @@ colorspaces:
children:
- !<FileTransform> {src: lg10.spi1d, interpolation: nearest}
- - !<ColorSpace>
- name: srgb8
- family: display
- equalitygroup:
- bitdepth: 8ui
- description: |
- RGB display space for the sRGB standard.
- isdata: false
- allocation: uniform
- from_reference: !<GroupTransform>
- children:
- - !<ColorSpaceTransform> {src: Linear, dst: lg10}
- - !<FileTransform> {src: spi_ocio_srgb_test.spi3d, interpolation: linear}
-
- !<ColorSpace>
name: sRGB
family:
@@ -262,19 +160,6 @@ colorspaces:
to_reference: !<FileTransform> {src: srgb.spi1d, interpolation: linear}
from_reference: !<FileTransform> {src: srgb_inv.spi1d, interpolation: linear}
- - !<ColorSpace>
- name: VD16
- family: vd
- equalitygroup:
- bitdepth: 16ui
- description: |
- The simple video conversion from a gamma 2.2 sRGB space
- isdata: false
- allocation: uniform
- to_reference: !<GroupTransform>
- children:
- - !<FileTransform> {src: vd16.spi1d, interpolation: nearest}
-
- !<ColorSpace>
name: Non-Color
family: raw
@@ -286,20 +171,6 @@ colorspaces:
allocation: uniform
allocationvars: [0, 1]
- - !<ColorSpace>
- name: p3dci8
- family: display
- equalitygroup:
- bitdepth: 8ui
- description: |
- p3dci8 :rgb display space for gamma 2.6 P3 projection.
- isdata: false
- allocation: uniform
- from_reference: !<GroupTransform>
- children:
- - !<ColorSpaceTransform> {src: Linear, dst: lg10}
- - !<FileTransform> {src: colorworks_filmlg_to_p3.3dl, interpolation: linear}
-
- !<ColorSpace>
name: Filmic Log
family: log
@@ -372,7 +243,7 @@ looks:
- !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse}
- !<Look>
- name: Filmic - Base Contrast
+ name: Filmic - Medium Contrast
process_space: Filmic Log
transform: !<GroupTransform>
children:
@@ -402,537 +273,55 @@ looks:
- !<FileTransform> {src: filmic_to_0-70_1-03.spi1d, interpolation: linear, direction: inverse}
- !<Look>
- name: Agfa Agfacolor Futura 100
- process_space: linear
- transform: !<GroupTransform>
- children:
- - !<FileTransform> {src: film_response/agfa_agfacolor_futura_100.spi1d, interpolation: linear}
- - !<FileTransform> {src: srgb.spi1d, interpolation: linear}
-
- - !<Look>
- name: Agfa Agfacolor Futura 200
- process_space: linear
- transform: !<GroupTransform>
- children:
- - !<FileTransform> {src: film_response/agfa_agfacolor_futura_200.spi1d, interpolation: linear}
- - !<FileTransform> {src: srgb.spi1d, interpolation: linear}
-
- - !<Look>
- name: Agfa Agfacolor Futura 400
- process_space: linear
- transform: !<GroupTransform>
- children:
- - !<FileTransform> {src: film_response/agfa_agfacolor_futura_400.spi1d, interpolation: linear}
- - !<FileTransform> {src: srgb.spi1d, interpolation: linear}
-
- - !<Look>
- name: Agfa Agfacolor Futura II 100
- process_space: linear
- transform: !<GroupTransform>
- children:
- - !<FileTransform> {src: film_response/agfa_agfacolor_futura_ii_100.spi1d, interpolation: linear}
- - !<FileTransform> {src: srgb.spi1d, interpolation: linear}
-
- - !<Look>
- name: Agfa Agfacolor Futura II 200
- process_space: linear
- transform: !<GroupTransform>
- children:
- - !<FileTransform> {src: film_response/agfa_agfacolor_futura_ii_200.spi1d, interpolation: linear}
- - !<FileTransform> {src: srgb.spi1d, interpolation: linear}
-
- - !<Look>
- name: Agfa Agfacolor Futura II 400
- process_space: linear
- transform: !<GroupTransform>
- children:
- - !<FileTransform> {src: film_response/agfa_agfacolor_futura_ii_400.spi1d, interpolation: linear}
- - !<FileTransform> {src: srgb.spi1d, interpolation: linear}
-
- - !<Look>
- name: Agfa Agfacolor HDC 100 plus
- process_space: linear
- transform: !<GroupTransform>
- children:
- - !<FileTransform> {src: film_response/agfa_agfacolor_hdc_100_plus.spi1d, interpolation: linear}
- - !<FileTransform> {src: srgb.spi1d, interpolation: linear}
-
- - !<Look>
- name: Agf
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list