[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48432] branches/soc-2011-tomato: Color management fixes and improvements
Sergey Sharybin
sergey.vfx at gmail.com
Sat Jun 30 14:36:20 CEST 2012
Revision: 48432
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48432
Author: nazgul
Date: 2012-06-30 12:36:03 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Color management fixes and improvements
- Made color management cache safe for situations when one area
requested a display buffer, then some changes were done which
invalidated cache, other area requested display buffer which
changed cached buffer.
Suck case could be fatal for first used of display buffer,
which didn't happen yet because cache is being accessed from
main thread only, but better to keep this things completely
thread save to avoid headache in the future.
- Baked RRT transformations, which gives ~3-4 times boost
hopefully without visible artifacts.
- Added support of partial updates to display buffers.
This would create special context which hols display buffer
which imbuf had to the time of creating this context and
later this context would allow to run a color correction
from given linear buffer within given region.
This is being used by compositor to enable more realtime
display update when compositing.
- Added support of color management backdrop for nodes editor.
There's now special menu called display properties in N-panel
of nodes editor.
Probably this better be de-duplicated somehow, but not sure
yet how. Currently it's not so harmful to have panel for two
spaces which contains only 2 properties.
There's currently one unsolved issue with backdrop:
it's not being updated progressively when just loading the
file -- it's simply because there's no color managed display
buffer for backdrop yet, and compositor doesn't actually
know which color space to use here to generate preview to.
Modified Paths:
--------------
branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
Added Paths:
-----------
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/rec709_aces_rrt_p3dci.3dl
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/rec709_aces_rrt_srgb.3dl
branches/soc-2011-tomato/release/datafiles/colormanagement/luts/rec709_aces_rrt_xyz.3dl
Modified: branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio
===================================================================
--- branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio 2012-06-30 11:14:10 UTC (rev 48431)
+++ branches/soc-2011-tomato/release/datafiles/colormanagement/config.ocio 2012-06-30 12:36:03 UTC (rev 48432)
@@ -182,9 +182,11 @@
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}
+ - !<FileTransform> {src: rec709_aces_rrt_srgb.3dl, interpolation: linear}
+ # That's an original transformation which ere baked
+ # - !<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: rrt_rec709
@@ -210,9 +212,11 @@
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}
+ - !<FileTransform> {src: rec709_aces_rrt_p3dci.3dl, interpolation: linear}
+ # That's an original transformation which ere baked
+ # - !<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: rrt_p3d60
@@ -238,6 +242,8 @@
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}
+ - !<FileTransform> {src: rec709_aces_rrt_xyz.3dl, interpolation: linear}
+ # That's an original transformation which ere baked
+ # - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
+ # - !<AllocationTransform> {allocation: lg2, vars: [-8.5, 5]}
+ # - !<FileTransform> {src: rrt_ut33_dcdm.spi3d, interpolation: tetrahedral}
Added: branches/soc-2011-tomato/release/datafiles/colormanagement/luts/rec709_aces_rrt_p3dci.3dl
===================================================================
--- branches/soc-2011-tomato/release/datafiles/colormanagement/luts/rec709_aces_rrt_p3dci.3dl (rev 0)
+++ branches/soc-2011-tomato/release/datafiles/colormanagement/luts/rec709_aces_rrt_p3dci.3dl 2012-06-30 12:36:03 UTC (rev 48432)
@@ -0,0 +1,4915 @@
+0 64 128 192 256 320 384 448 512 575 639 703 767 831 895 959 1023
+5 4 5
+0 212 749
+0 367 1296
+0 490 1702
+0 592 2019
+0 680 2277
+0 760 2493
+0 826 2672
+0 891 2827
+0 946 2958
+0 996 3071
+0 1046 3173
+0 1089 3262
+0 1128 3339
+0 1170 3410
+0 1209 3476
+0 1243 3534
+127 658 109
+146 734 820
+0 840 1348
+14 923 1744
+16 992 2056
+0 1056 2309
+0 1117 2522
+0 1166 2699
+0 1211 2851
+0 1254 2980
+0 1295 3092
+110 1334 3193
+185 1369 3280
+154 1400 3357
+127 1430 3427
+107 1459 3493
+152 1488 3550
+293 1142 204
+412 1194 892
+274 1262 1395
+297 1321 1779
+0 1368 2086
+128 1410 2336
+339 1448 2547
+176 1483 2721
+36 1517 2871
+69 1546 2999
+165 1574 3109
+269 1603 3210
+320 1628 3295
+351 1650 3370
+448 1673 3441
+550 1695 3506
+578 1717 3562
+402 1521 282
+644 1559 941
+653 1604 1434
+372 1646 1808
+606 1679 2110
+495 1708 2359
+508 1735 2567
+505 1759 2738
+539 1783 2888
+465 1801 3013
+401 1822 3123
+374 1843 3223
+469 1860 3307
+604 1876 3383
+749 1892 3453
+840 1909 3518
+818 1924 3572
+524 1820 350
+766 1851 988
+903 1884 1465
+759 1918 1831
+776 1944 2128
+763 1964 2374
+746 1984 2579
+793 1997 2751
+859 2012 2901
+768 2024 3024
+725 2038 3134
+696 2052 3233
+676 2062 3317
+744 2075 3391
+812 2089 3461
+878 2102 3526
+964 2112 3579
+660 2066 408
+914 2092 1027
+1042 2117 1493
+1092 2145 1853
+1006 2166 2143
+1011 2182 2386
+956 2196 2588
+868 2205 2759
+931 2216 2906
+1021 2222 3030
+1106 2229 3141
+1047 2239 3239
+1004 2246 3321
+972 2253 3397
+947 2260 3467
+933 2269 3532
+1029 2276 3583
+1022 2276 458
+1084 2301 1063
+1152 2320 1519
+1265 2341 1871
+1258 2358 2157
+1206 2369 2396
+1208 2378 2595
+1148 2384 2765
+1045 2390 2912
+1125 2393 3034
+1207 2398 3143
+1270 2402 3241
+1318 2405 3324
+1276 2410 3398
+1240 2415 3468
+1220 2421 3531
+1297 2425 3584
+1192 2455 504
+1270 2476 1093
+1330 2493 1544
+1369 2509 1887
+1419 2521 2166
+1398 2531 2401
+1372 2537 2599
+1389 2541 2767
+1367 2545 2911
+1292 2545 3034
+1300 2546 3143
+1350 2548 3239
+1412 2548 3322
+1474 2550 3399
+1512 2552 3469
+1497 2555 3531
+1564 2557 3583
+1371 2608 543
+1447 2627 1126
+1473 2641 1565
+1519 2654 1900
+1558 2664 2175
+1560 2673 2407
+1539 2676 2601
+1524 2678 2769
+1538 2679 2911
+1522 2678 3033
+1454 2677 3143
+1447 2676 3238
+1513 2675 3320
+1581 2674 3396
+1646 2674 3466
+1678 2674 3529
+1680 2673 3582
+1504 2743 601
+1568 2760 1161
+1605 2772 1586
+1632 2782 1915
+1667 2789 2184
+1684 2795 2411
+1687 2797 2602
+1665 2798 2767
+1662 2796 2908
+1682 2794 3030
+1678 2792 3139
+1665 2789 3234
+1691 2785 3318
+1711 2783 3392
+1733 2782 3462
+1761 2780 3523
+1793 2778 3576
+1643 2858 639
+1702 2873 1194
+1737 2884 1605
+1755 2892 1926
+1784 2897 2190
+1802 2903 2413
+1806 2904 2603
+1799 2904 2766
+1792 2901 2905
+1797 2898 3027
+1813 2895 3136
+1823 2891 3229
+1813 2886 3312
+1807 2883 3388
+1818 2880 3458
+1842 2877 3518
+1871 2874 3571
+1769 2961 669
+1815 2975 1226
+1842 2985 1625
+1857 2992 1938
+1885 2996 2198
+1897 3000 2417
+1911 3000 2604
+1919 3001 2766
+1910 2996 2902
+1903 2992 3023
+1902 2988 3133
+1916 2983 3224
+1929 2979 3307
+1920 2974 3383
+1916 2969 3454
+1932 2964 3513
+1960 2960 3566
+1875 3054 724
+1916 3067 1258
+1939 3076 1645
+1959 3082 1951
+1975 3085 2206
+1995 3087 2421
+2010 3085 2605
+2011 3084 2764
+2014 3080 2900
+2005 3074 3019
+2001 3069 3128
+2009 3063 3219
+2024 3057 3301
+2039 3053 3377
+2031 3048 3447
+2044 3042 3506
+2062 3036 3560
+1981 3135 774
+2021 3146 1288
+2046 3154 1666
+2073 3158 1962
+2077 3161 2214
+2094 3161 2424
+2097 3159 2605
+2102 3157 2762
+2106 3154 2897
+2103 3148 3016
+2096 3143 3123
+2102 3136 3213
+2111 3130 3296
+2125 3125 3372
+2140 3120 3442
+2141 3113 3499
+2143 3107 3552
+2085 3206 815
+2122 3217 1320
+2142 3224 1686
+2156 3228 1975
+2159 3230 2221
+2172 3229 2427
+2178 3227 2606
+2187 3225 2760
+2189 3221 2894
+2196 3217 3013
+2188 3211 3118
+2190 3204 3208
+2196 3197 3291
+2198 3191 3367
+2206 3186 3435
+2217 3179 3492
+2217 3172 3545
+2176 3272 843
+2204 3282 1350
+2223 3288 1706
+2233 3292 1990
+2237 3294 2230
+2246 3292 2432
+2258 3290 2607
+2262 3288 2759
+2267 3284 2892
+2271 3280 3011
+2273 3275 3114
+2267 3267 3203
+2264 3259 3285
+2264 3253 3360
+2268 3247 3429
+2277 3240 3485
+2288 3233 3539
+2255 3334 889
+2281 3342 1379
+2298 3349 1726
+2305 3353 2004
+2313 3353 2238
+2317 3352 2437
+2329 3349 2609
+2333 3346 2759
+2340 3341 2890
+2339 3337 3007
+2341 3331 3109
+2338 3322 3197
+2334 3314 3278
+2333 3306 3353
+2335 3299 3421
+2343 3291 3478
+2352 3284 3531
+656 104 0
+584 282 760
+507 428 1305
+389 547 1711
+203 646 2028
+25 734 2285
+0 808 2502
+26 876 2681
+232 936 2835
+312 991 2966
+267 1041 3079
+325 1087 3181
+345 1129 3270
+298 1171 3347
+257 1209 3417
+249 1246 3483
+330 1279 3542
+830 781 239
+861 806 840
+861 902 1359
+785 979 1752
+740 1049 2063
+670 1110 2316
+552 1166 2530
+356 1212 2706
+179 1255 2858
+232 1297 2987
+425 1337 3099
+618 1374 3200
+665 1407 3287
+655 1437 3363
+687 1466 3433
+725 1497 3499
+738 1525 3556
+991 1242 312
+1064 1266 919
+1064 1312 1406
+1040 1366 1786
+916 1411 2092
+901 1451 2343
+965 1490 2553
+884 1523 2727
+784 1557 2877
+736 1585 3004
+717 1610 3115
+753 1638 3215
+813 1661 3300
+883 1683 3376
+960 1705 3446
+1050 1728 3512
+1051 1749 3567
+1126 1591 375
+1205 1618 965
+1222 1643 1443
+1239 1683 1814
+1208 1715 2115
+1174 1743 2362
+1085 1771 2570
+1109 1793 2742
+1147 1817 2892
+1095 1834 3017
+1050 1853 3127
+1024 1873 3227
+1082 1889 3311
+1147 1904 3386
+1212 1920 3456
+1241 1936 3521
+1283 1951 3576
+1268 1873 431
+1336 1902 1010
+1356 1919 1474
+1365 1947 1836
+1354 1973 2132
+1370 1993 2378
+1353 2012 2582
+1310 2025 2753
+1283 2039 2903
+1306 2052 3026
+1335 2065 3136
+1289 2079 3236
+1239 2089 3319
+1258 2100 3394
+1303 2113 3463
+1349 2126 3527
+1416 2135 3580
+1399 2107 479
+1469 2133 1046
+1485 2152 1505
+1482 2170 1857
+1499 2191 2145
+1474 2206 2388
+1495 2220 2590
+1508 2229 2761
+1471 2240 2908
+1468 2245 3031
+1471 2252 3142
+1487 2262 3241
+1515 2268 3323
+1467 2275 3398
+1424 2282 3468
+1390 2290 3533
+1470 2297 3584
+1526 2310 522
+1585 2334 1079
+1602 2348 1530
+1616 2362 1874
+1609 2378 2158
+1609 2389 2398
+1587 2398 2596
+1608 2404 2766
+1622 2411 2912
+1628 2413 3034
+1618 2417 3143
+1617 2421 3240
+1633 2424 3324
+1657 2429 3399
+1681 2435 3469
+1649 2440 3532
+1700 2443 3584
+1634 2484 561
+1700 2504 1108
+1722 2516 1553
+1727 2530 1893
+1722 2539 2167
+1727 2548 2402
+1716 2554 2599
+1711 2558 2766
+1727 2561 2910
+1745 2561 3033
+1721 2562 3143
+1752 2564 3239
+1762 2564 3321
+1775 2566 3398
+1787 2568 3469
+1804 2571 3531
+1824 2572 3583
+1737 2633 597
+1806 2650 1141
+1825 2663 1575
+1829 2673 1907
+1834 2679 2176
+1826 2687 2407
+1839 2690 2600
+1816 2692 2767
+1816 2693 2909
+1832 2692 3031
+1854 2691 3142
+1836 2690 3238
+1868 2688 3319
+1885 2687 3394
+1890 2687 3464
+1900 2687 3526
+1917 2686 3580
+1832 2766 654
+1896 2780 1175
+1923 2790 1595
+1932 2797 1919
+1939 2802 2185
+1930 2806 2409
+1933 2809 2601
+1935 2810 2765
+1923 2808 2906
+1933 2806 3028
+1945 2804 3137
+1960 2801 3232
+1951 2797 3315
+1960 2795 3390
+1975 2794 3460
+1996 2792 3521
+2010 2789 3574
+1936 2878 685
+1989 2890 1207
+2020 2898 1613
+2030 2905 1930
+2033 2911 2194
+2030 2913 2412
+2026 2914 2601
+2034 2915 2764
+2029 2911 2902
+2020 2907 3025
+2024 2905 3133
+2036 2901 3226
+2051 2897 3309
+2044 2893 3386
+2046 2891 3456
+2064 2888 3516
+2087 2884 3569
+2029 2978 712
+2076 2990 1238
+2106 2997 1632
+2121 3003 1942
+2119 3007 2201
+2124 3009 2416
+2114 3008 2602
+2113 3008 2763
+2121 3004 2900
+2108 3000 3021
+2101 2997 3130
+2109 2992 3222
+2122 2987 3304
+2137 2983 3381
+2135 2979 3451
+2145 2974 3511
+2168 2969 3563
+2114 3070 770
+2157 3081 1269
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list