Replace Default OCIO config with AgX (Filmic v2) #106355

Closed
Zijun Zhou wants to merge 112 commits from (deleted):main into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

112 Commits

Author SHA1 Message Date
Zijun Zhou e1acf01111 Merge pull request 'Add one more Non-Color alias I forgot to include' (#20) from eary-add_one_more_nonColor_alias into main
Reviewed-on: Eary/blender-AgX#20
2023-07-27 01:18:12 +02:00
Zijun Zhou 16d0e106d0 Add one more Non-Color alias I forgot to include
Add the `Utility - Raw` from the ACES config to make sure people that have been using ACES can smoothly transition to this new config.
2023-07-27 01:17:15 +02:00
Zijun Zhou c2895997e7 Merge pull request 'Revert sRGB and Display P3 from 2.2 back to piece-wise' (#19) from eary-sRGB&P3_piece-wise into main
Reviewed-on: Eary/blender-AgX#19
2023-07-27 00:53:00 +02:00
Zijun Zhou 4c79c7652b Revert sRGB and Display P3 from 2.2 back to piece-wise
It's been discussed that the change to 2.2 is beyond simply changing the OCIO config.
2023-07-27 00:51:57 +02:00
Zijun Zhou cea51c2da9 Merge pull request 'Fix a small typo' (#18) from eary-AgX-fix-typo into main
Reviewed-on: Eary/blender-AgX#18
2023-07-21 12:25:12 +02:00
Zijun Zhou dceab09529 Fix a small typo 2023-07-21 12:24:00 +02:00
Zijun Zhou 1b8a110a90 Merge pull request 'Encode False Color to display encodings' (#17) from eary-AgX-display-encoded-false-color into main
Reviewed-on: Eary/blender-AgX#17
2023-07-21 11:53:36 +02:00
Zijun Zhou fec15a22c7 Encode False Color to display encodings
Original thought for not doing this was thinking I would like to use the maximum "purity" for the color-coded ranges, but after thinking it through, different displays' primaries have different perceptual "hue", therefore it will become confusing if I don't properly encode it.
2023-07-21 11:52:40 +02:00
Zijun Zhou ea583d4a24 Merge pull request 'Fix Lower Guard Rail issue with E Gamut Blue' (#16) from eary-AgX_fix-E-Gamut-Blue into main
Reviewed-on: Eary/blender-AgX#16
2023-07-21 11:37:36 +02:00
Zijun Zhou f32131f095 Fix Lower Guard Rail issue with E Gamut Blue 2023-07-21 11:36:26 +02:00
Zijun Zhou 30a7b80ac8 Merge pull request 'Add "view name - " prefix to look names for both AgX and Filmic Looks' (#15) from eary-view_name_look_prefix into main
Reviewed-on: Eary/blender-AgX#15
2023-07-19 20:14:14 +02:00
Zijun Zhou 6cdad6f5aa Add "view name - " prefix to look names for both AgX and Filmic Looks
Though this might not be the ideal behavior, at least get the Filmic Looks working for now.
2023-07-19 20:12:21 +02:00
Zijun Zhou 4a1a0d2e89 Merge pull request 'Boost BT2020 Lower Rail LUT precision' (#14) from eary-BT2020_Lower_Precision into main
Reviewed-on: Eary/blender-AgX#14
2023-07-15 11:21:10 +02:00
Zijun Zhou ab25a6e25d Boost BT2020 Lower Rail LUT precision 2023-07-15 11:19:38 +02:00
Zijun Zhou fb145c32e2 Merge pull request 'Remove Range Clipping in BT2020 Lower Rail' (#13) from eary-remove_2020_LR_Clip into main
Reviewed-on: Eary/blender-AgX#13
2023-07-15 10:43:36 +02:00
Zijun Zhou 151c096ddb Remove Range Clipping in BT2020 Lower Rail
Fix some issues caused by the last commit
2023-07-15 10:42:40 +02:00
Zijun Zhou 78a217683d Merge branch 'main' into main 2023-07-15 09:58:27 +02:00
Zijun Zhou db61505984 Merge pull request 'Define BT.2020 lower rail's inverse direction' (#12) from eary-2020GR-Lower-Inverse into main
Reviewed-on: Eary/blender-AgX#12
2023-07-15 09:56:49 +02:00
Zijun Zhou 7cb01b5a61 Define BT.2020 lower rail's inverse direction 2023-07-15 09:54:42 +02:00
Zijun Zhou fa8d9468ea Merge pull request 'Improve False Color precision by using a power 1/2.5 shaper' (#11) from eary-false_color_shaper into main
Reviewed-on: Eary/blender-AgX#11
2023-07-11 16:50:57 +02:00
Zijun Zhou 157708478b Update config to use the added False Color shaper 2023-07-11 16:46:35 +02:00
Zijun Zhou f703f14c28 Improve False Color Precision by adding a power 1/2.5 shaper
Need to update the config as well
2023-07-11 16:44:09 +02:00
Zijun Zhou 8e786b5bbe Merge pull request 'Boost Higher Guard Rail Resolution to 55' (#10) from eary-GR-Res-55 into main
Reviewed-on: Eary/blender-AgX#10
2023-07-02 21:05:45 +02:00
Zijun Zhou 29fe7cbfd7 Boost Higher Guard Rail Resolution to 55
Trying to get a smoother attenuation on the upper range of AgX where the original BT.2020 image has values above 1.
2023-07-02 21:03:54 +02:00
Zijun Zhou f4883ed86b Merge branch 'main' into main 2023-06-22 19:16:55 +02:00
Zijun Zhou b039a8f737 Merge pull request 'Ironing out unsmoothness on th reds by making red's rate of change faster' (#9) from eary-faster_red_roc into main
Reviewed-on: Eary/blender-AgX#9
2023-06-22 18:44:48 +02:00
Zijun Zhou 21741f9b9f Ironing out unsmoothness on th reds by making red's rate of change faster
Change Red's rate of change again, to fix some unsmoothness I saw on Red Xmas's right child's face.
2023-06-22 18:43:45 +02:00
Zijun Zhou 9987220fe8 Merge pull request 'Fix Guard Rail Matrix Hack Shifting BT.2020 Green' (#8) from eary-fix-GR-MHack into main
Reviewed-on: Eary/blender-AgX#8
2023-06-15 05:19:10 +02:00
Zijun Zhou eead6266a2 Fix Guard Rail Matrix Hack Shifting BT.2020 Green
Turn the matrix strength down to avoid shifting the BT.2020 green.
2023-06-15 05:17:09 +02:00
Zijun Zhou 0fc8a9c475 Merge branch 'main' into main 2023-06-14 17:57:47 +02:00
Zijun Zhou 213e928f8d Merge pull request 'Improve Rate of Change Again' (#7) from eary-improve-rate-of-change-again into main
Reviewed-on: Eary/blender-AgX#7
2023-06-14 17:57:07 +02:00
Zijun Zhou 48275fb39c Improve Rate of Change Again
I think this should be the last edit reguarding rate of change, if nothing unexpected pop up.
2023-06-14 17:56:19 +02:00
Zijun Zhou 99446db90a Merge pull request 'Tweak Blue Flourish to make the blue rotation less strong' (#6) from eary-reduce_blue_flourish into main
Reviewed-on: Eary/blender-AgX#6
2023-06-12 17:17:48 +02:00
Zijun Zhou 55b5191260 Tweak Blue Flourish to make the blue rotation less strong 2023-06-12 17:16:37 +02:00
Zijun Zhou 96a3f12808 Merge branch 'main' into main 2023-06-07 00:18:49 +02:00
Zijun Zhou 31c6d1cdc2 Merge pull request 'Improve Rate of Change' (#5) from eary_agx_improve_rate_of_change into main
Reviewed-on: Eary/blender-AgX#5
2023-06-07 00:14:57 +02:00
Zijun Zhou 04df44db01 Improve Rate of Change
Try fixing some "rings" visible in some gradients by improving the rate of change.
2023-06-07 00:13:27 +02:00
Zijun Zhou 5d5b8ca7f7 Merge branch 'main' into main 2023-06-03 18:55:49 +02:00
Zijun Zhou 837ad59865 Redo startup file change after solving merge conflict
Set default startup view transform to AgX
2023-05-17 12:52:36 +02:00
Zijun Zhou 4ec851ac86 Merge pull request 'merge blender: main into AgX branch' (#4) from blender/blender:main into main
Reviewed-on: Eary/blender-AgX#4
2023-05-17 11:17:19 +02:00
Zijun Zhou 010df80284 Try resolving merge conflict
I don't see any buttom on the Gitea website to resolve it, trying to see if there is some other way to do it.
2023-05-17 10:54:35 +02:00
Zijun Zhou aa9e58960c Update startup file from Main Blender 2023-05-17 10:44:38 +02:00
Zijun Zhou bf0dc3aca5 Merge branch 'main' into main 2023-05-09 12:42:41 +02:00
Zijun Zhou 51a2a333c9 Fix bug in AgX Log 2023-04-27 05:11:55 +02:00
Zijun Zhou 55871fef15 Fix bug in last commit 2023-04-27 05:07:06 +02:00
Zijun Zhou 1a3937826d Fix BT.2020 lower rail's end space transform 2023-04-27 05:06:22 +02:00
Zijun Zhou a8782a01ba Merge branch 'main' into main 2023-04-27 04:52:19 +02:00
Zijun Zhou c2deec50d3 Update config to use updated LUTs
The LUTs are updated in order to improve LUT precision
2023-04-27 04:44:59 +02:00
Zijun Zhou 7ec4936183 Remove BT.2020's all-in-one Guard Rail LUT 2023-04-27 04:44:06 +02:00
Zijun Zhou 1aa3f96ebf Increase BT.2020 lower rail's LUT resolution 2023-04-27 04:43:11 +02:00
Zijun Zhou e7b29ac83c Update 'release/datafiles/colormanagement/LUTs/luminance_compensation_p3.cube' 2023-04-27 04:40:51 +02:00
Zijun Zhou c95cae49b5 Rename P3 Lower Guard Rail LUT 2023-04-27 04:39:38 +02:00
Zijun Zhou c3a0464238 Change original Guard Rail P3 LUT to Lower Side LUT 2023-04-27 04:37:44 +02:00
Zijun Zhou ad6e01f5bf Change original Guard Rail sRGB LUT to Lower Side LUT 2023-04-27 04:35:57 +02:00
Zijun Zhou 7e78109c37 Upload Updated Guard Rail Higher LUT and its shaper LUT 2023-04-27 04:32:43 +02:00
Zijun Zhou a00316165a revert 83e5bd2a8f
revert Use matrix to minimize Guard Rail precision issue
2023-04-03 14:02:22 +02:00
Zijun Zhou 6bfb0244b8 Modify Guard Rail sRGB bypass range 2023-04-03 09:11:46 +02:00
Zijun Zhou 8b4190fbf1 Make Non-Color description more clear 2023-04-03 09:09:32 +02:00
Zijun Zhou 83e5bd2a8f Use matrix to minimize Guard Rail precision issue 2023-04-03 09:07:02 +02:00
Zijun Zhou fbfd10ca18 Redo previous commit 2023-04-02 12:14:29 +02:00
Zijun Zhou 954d9e9eba revert 810a49c241 Made a mistake
revert Rename Guard Rail back to `Guard Rail` and `Legacy Standard` back to Standard
2023-04-02 12:13:33 +02:00
Zijun Zhou 810a49c241 Rename Guard Rail back to `Guard Rail` and `Legacy Standard` back to Standard 2023-04-02 10:07:22 +02:00
Zijun Zhou 2c1c2aa60f Merge branch 'main' into main 2023-04-02 07:43:02 +02:00
Zijun Zhou aeccba9f69 Implement hack in config to compensate for purity lost due to Guard Rail LUT's precision
Using a hack in Guard Rail, use CDL sat to bring back a bit of purity, this causes wider gamut render to be a bit less smooth but the degree is acceptable. Might remove this hack in the future if better approach comes or when the community cares less about "looking exactly like display's native".
2023-04-02 07:24:58 +02:00
Zijun Zhou fecdf7f96b revert `Modify Bypass range of Guard Rail sRGB`, that commit causes clippings in wider gamut render
revert Modify Bypass range of Guard Rail sRGB for better precision of valid values

Trying a bit hacky approach, leaving in a little bit of negative and higher-than-1.0 values, though violates Guard Rail's design principal, it does improve the valid values' precision.
2023-04-02 06:50:01 +02:00
Zijun Zhou 58e7d134c8 Modify Bypass range of Guard Rail sRGB for better precision of valid values
Trying a bit hacky approach, leaving in a little bit of negative and higher-than-1.0 values, though violates Guard Rail's design principal, it does improve the valid values' precision.
2023-04-02 06:44:07 +02:00
Zijun Zhou c78263eac6 Add `Legacy Standard`
Not a good idea in my opinion, but people are complaining it's absence.
2023-04-02 01:53:56 +02:00
Zijun Zhou 30d0cf8d06 Change Startup View Transform to AgX 2023-04-01 12:54:41 +02:00
Zijun Zhou 5eea2489e1 Return to I-D65 working space 2023-04-01 10:04:54 +02:00
Zijun Zhou 95fe126d14 Merge branch 'main' into main 2023-04-01 07:27:20 +02:00
Zijun Zhou ee58983962 Delete 'release/datafiles/colormanagement/LUTs/filmic_to_0-70_1-03.spi1d' 2023-04-01 07:25:48 +02:00
Zijun Zhou e32111e768 Delete 'release/datafiles/colormanagement/LUTs/filmic_desat_33.cube' 2023-04-01 07:25:25 +02:00
Zijun Zhou 173ec69d3f Move Filmic desat LUT to filmic folder 2023-04-01 07:24:55 +02:00
Zijun Zhou fa3bba1cbd Fix mistaken in previous commit 2023-04-01 07:21:17 +02:00
Zijun Zhou fefac35382 Update LUT search path to include filmic looks LUTs 2023-04-01 07:20:32 +02:00
Zijun Zhou 6b0519234a Upload Filmic Looks LUTs 2023-04-01 07:18:15 +02:00
Zijun Zhou 8f3a92509b bring back Filmic looks LUTs 2023-04-01 07:16:37 +02:00
Zijun Zhou 8fa801f9b9 Merge branch 'main' into main 2023-03-31 13:34:57 +02:00
Zijun Zhou f6f0cf260e Reintroduce View name `Standard` back as requested
I don't quite like the name but it is requested
2023-03-31 12:54:39 +02:00
Zijun Zhou f95a7c34a3 Rename `Generic Data` back to `Non-Color` 2023-03-31 12:39:36 +02:00
Zijun Zhou 40e6334027 Add back `aces_interchange` role and Add `cie_xyz_d65_interchange` role 2023-03-31 12:33:53 +02:00
Zijun Zhou c3f917783b Add back `Filmic` as view transform for backwards compatibility 2023-03-31 12:28:12 +02:00
Zijun Zhou e320430265 Remove power value from names `sRGB 2.2` `Display P3 2.2` `BT.1886 2.4` `BT.2020 2.4` etc. 2023-03-31 11:39:16 +02:00
Zijun Zhou 12bfec64c1 Merge branch 'main' into main 2023-03-31 10:06:04 +02:00
Zijun Zhou fe95cb62a8 Merge pull request 'sync with Blender Main' (#2) from blender/blender:main into main
Reviewed-on: Eary/blender-AgX#2
2023-03-31 04:34:38 +02:00
Zijun Zhou f0aef4bc5d Merge pull request 'sync with blender main' (#1) from blender/blender:main into main
Reviewed-on: Eary/blender-AgX#1
2023-03-30 15:00:03 +02:00
Zijun Zhou f056f9683a Delete 'release/datafiles/colormanagement/luts/vd16.spi1d' 2023-03-29 23:17:24 +02:00
Zijun Zhou 9660fa953f Delete 'release/datafiles/colormanagement/luts/xyz_to_aces.spimtx' 2023-03-29 23:17:10 +02:00
Zijun Zhou ddfae13ed5 Delete 'release/datafiles/colormanagement/luts/xyz_D65_to_E.spimtx' 2023-03-29 23:16:47 +02:00
Zijun Zhou dbaa76de8c Delete 'release/datafiles/colormanagement/luts/srgb_to_xyz.spimtx' 2023-03-29 23:16:17 +02:00
Zijun Zhou bb5d0a28f5 Delete 'release/datafiles/colormanagement/luts/srgb_inv.spi1d' 2023-03-29 23:15:55 +02:00
Zijun Zhou f8c06233fd Delete 'release/datafiles/colormanagement/luts/rec709.spi1d' 2023-03-29 23:14:53 +02:00
Zijun Zhou 6737e6c8d2 Delete 'release/datafiles/colormanagement/luts/srgb.spi1d' 2023-03-29 23:14:15 +02:00
Zijun Zhou b4bc1abdf3 Delete 'release/datafiles/colormanagement/luts/lg10.spi1d' 2023-03-29 23:13:57 +02:00
Zijun Zhou 5faaf63e83 Delete 'release/datafiles/colormanagement/luts/dci_xyz.spi1d' 2023-03-29 23:13:33 +02:00
Zijun Zhou d4993cfad7 Delete 'release/datafiles/colormanagement/filmic/filmic_to_1.20_1-00.spi1d' 2023-03-29 23:09:14 +02:00
Zijun Zhou 1156ac4dcf Delete 'release/datafiles/colormanagement/filmic/filmic_to_0-85_1-011.spi1d' 2023-03-29 23:08:50 +02:00
Zijun Zhou e26ef212e3 Delete 'release/datafiles/colormanagement/filmic/filmic_to_0.99_1-0075.spi1d' 2023-03-29 23:08:30 +02:00
Zijun Zhou 6e207e4ba0 Delete 'release/datafiles/colormanagement/filmic/filmic_to_0-70_1-03.spi1d' 2023-03-29 23:08:16 +02:00
Zijun Zhou 3425c99e6c Delete 'release/datafiles/colormanagement/filmic/filmic_to_0-60_1-04.spi1d' 2023-03-29 23:07:48 +02:00
Zijun Zhou 9830a1b6aa Delete 'release/datafiles/colormanagement/filmic/filmic_to_0-48_1-09.spi1d' 2023-03-29 23:07:18 +02:00
Zijun Zhou f9e04da8fd Delete 'release/datafiles/colormanagement/filmic/filmic_to_0-35_1-30.spi1d' 2023-03-29 23:06:13 +02:00
Zijun Zhou f1cd24d01c Delete 'release/datafiles/colormanagement/filmic/filmic_false_color.spi3d' 2023-03-29 23:04:56 +02:00
Zijun Zhou f3ba4b5f2c Delete 'release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d' 2023-03-29 23:00:58 +02:00
Zijun Zhou efd40874a3 Add BT.2020 Guard Rail LUT 2023-03-29 22:59:53 +02:00
Zijun Zhou 2504bc5dcc Add P3 Guard Rail LUT 2023-03-29 22:58:15 +02:00
Zijun Zhou 9176d4566a Add sRGB Guard Rail LUT 2023-03-29 22:56:46 +02:00
Zijun Zhou 149140688e Upload AgX LUTs 2023-03-29 22:46:47 +02:00
Zijun Zhou 1b18cb41b2 Upload AgX LUTs 2023-03-29 22:44:16 +02:00
Zijun Zhou 44566d7273 try to upload AgX config 2023-03-29 22:43:03 +02:00
Zijun Zhou 8bd63ae47b revert 610788d62b
revert Upload AgX
2023-03-29 20:12:12 +02:00
Zijun Zhou 610788d62b Upload AgX 2023-03-29 20:11:13 +02:00