blender/blender
150
477
Fork 703
Code Issues 6.8k Pull Requests 899 Projects 18 Wiki Activity

Blender LTS: Maintenance Task 4.2 #124452

New Issue
Open
opened 2024-07-10 14:35:41 +02:00 by Thomas Dinges · 22 comments
Thomas Dinges commented 2024-07-10 14:35:41 +02:00
Owner
Copy Link

This task is a management task to track the commits and fixes that will be or are already applied to Blender 4.2 rolling release. The process is documented on https://wiki.blender.org/wiki/User:Jbakker/projects/BlenderLTS/ProcessDescription

NOTE: When changing this task please make sure to stick to the markup. The description is parsed to generate the release notes.

  • Final commit of initial release:
  • Last merge of blender-v4.2-release to main:
  • Last checked commit in main:

To Be Backported

NOTE: When adding commits please add the repository prefix to it. The release note generator requires the prefix.

NOTE: When adding items, please add them to the bottom of the To Be Backported list (not the Blender 4.2.x list).

NOTE: please leave a remark if a particular commit needs library updates in the branch, e.g. #109771

NOTE: commits are checked for having followup-issues (skipped for release in that case), if there are other reasons a commit should not be in a particular release, please also leave a remark (or remove the commit from the list again)

Report Commits in main Remarks
#124621 blender/blender@3fcd80db68 & blender/blender@d7a7491518 and (hopefully last) blender/blender@2718f24b5c The commits changes the look of transmissive materials, don't backport yet
#124642 blender/blender@e7ce8d33e3 May not be suitable for LTS
#117367 blender/blender@86e7668b11 conflicts (probably misses blender/blender@0089a90625 in 4.2?), prefer if @Scurest / @Aras check
#126147 blender/blender@7597f494b9 conflicts because of a9a047c0e3, prefer if @mont29 / @jacqueslucke check
Did not realized SharedData for PackedFiles was not in 4.2, this backport is not needed then -- @mont29
None blender/blender@89c389c465
None blender/blender@a9bfca5483
None blender/blender@00bc059894 Must backport blender/blender@89c389c465 first
#69164 blender/blender@46cd88f229, blender/blender@d254a0886e, blender/blender@5387605833, blender/blender@24dc9a21b1 (partially) See PR !127548
None blender/blender@e242157674 See PR !127550
None blender/blender@8b5f3c4671
#127213 blender/blender@f5b16e474f, blender/blender@2954323c2d
#126792 blender/blender@6822e61c6f
None blender/blender@e6933e526c
None blender/blender@630eff9b5e See PR !127672
None blender/blender@bf7c52cfd5
None blender/blender@a396b2ccee
None blender/blender@92febd5fb2, blender/blender@b8f236510d
#127636 blender/blender@0311d8082b
None blender/blender@8345ebc704
None blender/blender@8345ebc704
#125093 blender/blender@d300098ee5
#126524 blender/blender@0d9ab189d1
#127654 blender/blender@bab4f7a0cd
#127590 blender/blender@9c54ddff69

Blender 4.2.2

Report Commits in main Commits in LTS Remarks
#105895 blender/blender@92f633e7cb blender/blender@973944bd96
#126483 blender/blender@975dcea23f & blender/blender@994e14b000 blender/blender@287e832769 & blender/blender@ebb678d7aa
#126419 blender/blender@0c6365ecad blender/blender@a87c58d2ca Clonflict:BKE_paint_brushes_validate -> BKE_paint_brush_validate
#126494 blender/blender@0d4e2ea40d blender/blender@7c40204c75
#126450 blender/blender@7dbff95070 blender/blender@b2e4251789
#126526 blender/blender@399498fdc0 blender/blender@2aac428a2e
#123405 blender/blender@a51f6b6923 blender/blender@871e5b1c32
#126551 blender/blender@d6ea01bd38 blender/blender@6f4d5f0e3b
#124832 blender/blender@ddcf5bac44 blender/blender@45744122fa
#124693 blender/blender@bf529e248a blender/blender@cb66ff5c5d
#126552 blender/blender@844d6d2df0 blender/blender@54f19d79f7
#126324 blender/blender@ce82d4434f blender/blender@329e8d2eb2
#126595 blender/blender@93546768ba blender/blender@85d47f5486
None blender/blender@6c82c039db blender/blender@2c9e26acc5
None blender/blender@e00b7c4ad4 blender/blender@70475861cd
#120950 blender/blender@1b23a8983d blender/blender@826ca2fd4a
None blender/blender@0f2f9cd230 blender/blender@e877bedac7
#126556 blender/blender@7391810b53 blender/blender@3e00bea76b
#126412 blender/blender@529c720457 blender/blender@ddf37910f9
None blender/blender@16bf67cf37 blender/blender@1e9ae10e90 conflicts, resolved
None blender/blender@765052fdb8 blender/blender@c391602677
#126567 blender/blender@758401c672 blender/blender@60a3635490
None blender/blender@92d935a205 blender/blender@fc31352b70 Compilation error fix for MSVC 17.11
#126459 blender/blender@0d4c76c986 blender/blender@b1b1860dca
#126351 blender/blender@0bad30317c blender/blender@93343f5a9d
#124752 blender/blender@58bd3d40ee blender/blender@808ad059f3
#125184 blender/blender@3a81bde896 blender/blender@71d0487118
None blender/blender@6bd515e0d2 blender/blender@f50e4cbb62
#126734 blender/blender@d63db15fe9 blender/blender@3adc0f29e5
None blender/blender@798fbe7dbd blender/blender@7ceedb5f4c
#123787 blender/blender@78af1722cf blender/blender@35ed57eb2a
#125333 blender/blender@dc8f5d5b89 blender/blender@9db4d55a43 conflicts, resolved
#126535 blender/blender@d2c38d3fdc blender/blender@f04dd896e8
#126573 blender/blender@d9cfb9fea2 blender/blender@216bef634c
#126225 blender/blender@41da774dd0 blender/blender@4f8c4b588b
N/A blender/blender@92733a9415 blender/blender@357fb5c5ff Fix memory leak in Cycles HIP-RT
#126677 blender/blender@1dbb88070b blender/blender@dec9fefeb5
#126798 blender/blender@82a4291596 blender/blender@54f10c31b1
#126856 blender/blender@d1f0084a33 blender/blender@2c1f83561f
None blender/blender@db5cd39a67 blender/blender@fb14083ff5
#126633 blender/blender@2cc395be06 blender/blender@8909836fa8
None blender/blender@86f2c120f2 blender/blender@574d096f78
#126852 blender/blender@0f3793205d blender/blender@9f14211e6a
None blender/blender@42840ded01 blender/blender@fc9b876f25 conflicts, resolved
None blender/blender@6191eb1e9d blender/blender@e38cda5280 conflicts, resolved
None blender/blender@7c6975f6c8 blender/blender@4f660c3b2c conflicts, resolved
None blender/blender@69ab986370 blender/blender@f82b50654a conflicts, resolved
None blender/blender@780721de19 blender/blender@f59641b6b0 conflicts, resolved
#126986 blender/blender@325ed460a7 PR apply !127068
#127022 blender/blender@c4a67ec3c7 blender/blender@212ee52082
None blender/blender@e5e5d5fe73 blender/blender@b22dd61a47
#120861 blender/blender@e9333c82ab blender/blender@89d1bab74b
#126799 blender/blender@77035192c9 blender/blender@99d80a0b49
#126038 blender/blender@2afb9e3d95 blender/blender@05c2d8d810
None blender/blender@790333578b blender/blender@374da29f6a
None blender/blender@787eb2b433 blender/blender@50506c7945
#127085 blender/blender@324e1441a2 blender/blender@84b8c07089
#126908 blender/blender@174387e4d9 blender/blender@849f91415c
#124811 blender/blender@94c9898f41 blender/blender@ac477fc15f
None blender/blender@1a0dbbd242 blender/blender@b72ad1209a
None blender/blender@9d3ddf6a04 blender/blender@7bc471630b
None blender/blender@8db8185276 blender/blender@0b42a3aabc conflicts, resolved
None blender/blender@36415cfaad blender/blender@a9745f2a16
#127012 blender/blender@7bb8ab8194 blender/blender@8d1dcd59c9
#123138 blender/blender@acde253b9d blender/blender@80fa49f24a
#127165 blender/blender@1235404cfe blender/blender@99ba15adff
#127039 blender/blender@75d5e69d44 blender/blender@2640f04329
None blender/blender@8febf15ea5 blender/blender@73c27fd650
None blender/blender@73ac0275c6 blender/blender@b49c8bd8da
#127319 blender/blender@0358a3d11f blender/blender@46f157ff72
#125506 blender/blender@d3909d42c6 blender/blender@1da1846066
#126463 blender/blender@0db13bef19 blender/blender@21bea714fd
None blender/blender@62dbebc18e & blender/blender@9d6ecd0ed6 blender/blender@fcc87f4488 & blender/blender@afb9b0ae05
None blender/blender@d122d19f00 blender/blender@f06c7a50c6
None blender/blender@2593fffa4d blender/blender@0cb427c911
#127329 blender/blender@54153629f4 blender/blender@55bd057497
#122837 blender/blender@5f34338296 blender/blender@37a3eb5aa2
#126821 blender/blender@4c2718e318 blender/blender@e18aa65973 blender/blender@1479bf6eec & blender/blender@6f672295a5
#124549 blender/blender@c41bb20008 blender/blender@a33ff3eafd
#127142 blender/blender@3915a84fc6 blender/blender@4b8fbd8c2f Used !127149 instead
#126706 N/A blender/blender@252cc7839f PR to apply: #126894
#124167 blender/blender@a5970b8248 blender/blender@06b9a46edb "Note that I would consider this very scary to backport to 4.2" in blender/blender!125084, needs clarification @mont29 @JulianEisel
I would rather wait for 4.2.2 to backport this one - @mont29
Backported through blender/blender!127696
#126549 blender/blender@6e143cbf75 blender/blender@638d950f64 build errors in debug mode (buildbot apparently catches these) because of missing LIB_EMBEDDED_DATA, prefer if @mont29 checks
Backported through blender/blender!127700

Blender 4.2.1

Report Commits in main Commits in LTS Remarks
blender/blender@bf738fd35a committed directly to blender-v4.2-release
#125063 blender/blender@9427ec3f40 blender/blender@1b7485f208
#124020 blender/blender@fd5780e97b blender/blender@23fc0d53e1
#124431 blender/blender@96cc9109fd blender/blender@57b6d3eafc
#102994 blender/blender@5705065db1 blender/blender@0785c6129c
None blender/blender@10b871a211 blender/blender@5bf1be8f51
None blender/blender@0b0481cf54 blender/blender@c3268834d7
#124637 blender/blender@71e1305b06 blender/blender@7a8cdde2fd
#124625 blender/blender@649fa05bcb blender/blender@46fbb6ccfe
#124705 blender/blender@cf96136ec6 blender/blender@4a32a104c4
None blender/blender@471a148666 blender/blender@4f6a5f963c
#124552 blender/blender@e7fa847bba blender/blender@12e6d73a44
#124745 blender/blender@138e914346 blender/blender@264c55c2db
#124817 blender/blender@7438bf8e0f blender/blender@35f6a7b94a has versioning code
#124868 blender/blender@aac0189e2c blender/blender@fc47e12eb6
None blender/blender@4f46493eae blender/blender@7033d9bcf2
#124850 blender/blender@c7a26cf5c2 blender/blender@e3ba59c4f6
#123096 blender/blender@80f0c613c0 blender/blender@06aa7eb929
None blender/blender@4000e1f2f2 blender/blender@1f12bd3c49
#124501 blender/blender@5f54c463c0 blender/blender@eab80f9819
#124931 blender/blender@604dc2cc33 blender/blender@bac5ab1d4f
#124589 blender/blender@7a260b761d blender/blender@e16272f8de
#124623 blender/blender@63db751cde blender/blender@20cab1cf11
#124767 blender/blender@6a39d79967 blender/blender@261982da38
#124990 blender/blender@71e1d795b3 blender/blender@9dd1edb5ef
#120465 blender/blender@cb4aa93480 blender/blender@611fd4640f
None blender/blender@a616799607 blender/blender@de1806f415
#120253 blender/blender@fe1bf4897d blender/blender@9c48a5e476
#124769 blender/blender@9a568f2227 blender/blender@17c47b9a69
#125202 blender/blender@d40c2705a1 blender/blender@e696590ce1
#125142 blender/blender@68c2c9cb26 blender/blender@27b629a82c
#125023 blender/blender@d4aecd93e7 blender/blender@6aacd9fa56
#125006 blender/blender@d5d64f4a9f blender/blender@2e53ea7d77
#125168 blender/blender@90e83175eb blender/blender@d773dea6a7
#125134 blender/blender@6d302ca7ca blender/blender@8496cca34c
#124885 blender/blender@f3a0ecb4e2 & blender/blender@1aa37c8df2 blender/blender@a480c50ad6 & blender/blender@9f53425eb6
#125046 blender/blender@38766fd018 & blender/blender@bc2e47622f blender/blender@0ecaa6631e & blender/blender@54951b1e19
None blender/blender@3d0db481f4 blender/blender@d3d22496bc conflicts, resolved
None blender/blender@0c836f7f1a blender/blender@ee3d935deb conflicts, resolved
None blender/blender@0e881a7772 blender/blender@6c8510f0c0 conflicts, resolved
#125112 blender/blender@c46679c108 blender/blender@7fff1ab3a8
#125319 blender/blender@6e152df547 blender/blender@c8aaaa4daa
#124859 blender/blender@46d0e8acbe blender/blender@af5ff37dd5 blender/blender@92149a4a28 blender/blender@6377142b8a Requires platform maintainers to rebuild libs, an early back port would be appreciated
#125061 blender/blender@527e55239b blender/blender@0d89a63ca5 minor build failures resolved
#125043 blender/blender@6432d54ef7 blender/blender@ddaddef5c4
#124922 blender/blender@160f27330f blender/blender@c15c74f919 included tests/data submodule update
N/A N/A (completely different fix, blender/blender@a62f1dc6cc) blender/blender@449c4fc72e From PR !125003
N/A blender/blender@813c18e39c blender/blender@c2c3ccb42f
#125466 blender/blender@7fcd4e2429 blender/blender@174f8de75e Fix in main different from release branch fix/workaround
#124859 blender/blender@2bf5a12e3b blender/blender@c10d9a556f
None blender/blender@7374077610 & blender/blender@48d55fb420 blender/blender@7a16c7532c Committed directly to blender-v4.2-release
#122858 blender/blender@13f27ea0ae & blender/blender@4cf9f53946 blender/blender@1d61869970 & blender/blender@6dd6563aa4
#122754 blender/blender@8da807684c blender/blender@0a970a3a0e
None blender/blender@32c721767e blender/blender@04d8595e55
#125340 blender/blender@6041bdd93a blender/blender@4459944ca7 Technically applicable for 3.3 LTS as well
#124899 blender/blender@d80f0aa068 blender/blender@b535e5c2d7
#125064 blender/blender@163baad17e blender/blender@54eaedd889
blender/blender@c13c502624 blender/blender@f49b57811e
#123735 blender/blender@0baeca8f9e blender/blender@17b48ee22d
#125404 blender/blender@37fca25820 blender/blender@651fe704e9
#125395 blender/blender@1c69154aaf blender/blender@f51e188dc2
#125395 blender/blender@1c69154aaf blender/blender@f51e188dc2
None blender/blender@8019ad8912 blender/blender@778524fce3
None blender/blender@656fe6d3e4 blender/blender@0f24fd7756 had a followup commit, see below
#125763 blender/blender@f8e06a5f5f blender/blender@b99980b485
#123179 blender/blender@0dad3bdfa7 blender/blender@09ae4bffc2
None blender/blender@d610ae2764 blender/blender@451ee89c48
#124836 blender/blender@8b3beeee82 blender/blender@02e1efd3ab
#125446 blender/blender@b17734598d blender/blender@6febc4d6b5
#125588 blender/blender@7903aa6faa blender/blender@4bbe545453
#125400 blender/blender@a26819ad88 blender/blender@7af629a25b
#125402 blender/blender@69154a5e3b blender/blender@90e21c365c
#125607 blender/blender@0cf688401b blender/blender@bfa793a11b
#125636 blender/blender@fc8341538a blender/blender@2bcc7cff41
#125660 blender/blender@3a88af5402 blender/blender@a6222ab8b9
#125226 blender/blender@ba1f7caffa blender/blender@d00807a135
#125387 blender/blender@0c429ee652 blender/blender@85cc88a262
None blender/blender@2cf09525a7 blender/blender@623e196f67
#124731 blender/blender@14b03fca3c blender/blender@72da916b09
None blender/blender@ef505727c6 blender/blender@93be30b217
#125672 blender/blender@0b97228cbc blender/blender@03201d9216
#125232 blender/blender@4d85c03815 blender/blender@9d35a4bfa7
#125509 blender/blender@a2b53f47dd blender/blender@8b18cf0d2b
#125542 blender/blender@06fab9f8f1 blender/blender@1bae2fbf3b
#125185 blender/blender@644e7bf309 blender/blender@2608c887f2
#125750 blender/blender@5b61a01c19 blender/blender@0fa0cb84bd
None blender/blender@805f66c5c4 blender/blender@fdbb8efa9d
None blender/blender@afa44b16a6 blender/blender@9c3ade79f2
#77837 blender/blender@fc6a99e0d2 blender/blender@e1b5ca0bd1
#123327 blender/blender@7fcd4e2429 blender/blender@174f8de75e A proper fix was committed to main with 7fcd4e2429, this is a 4.2 specific workaround that is more minimal and safe, also fixes #125466
#124702 blender/blender@c90f13f2b3 blender/blender@f7d6f499b7
#122454 blender/blender@09390858ab blender/blender@cb8fe2bcd5
None blender/blender@9c622d3b2b blender/blender@ee025327a5
None blender/blender@5110833ff1 blender/blender@d255681e9c
#125826 blender/blender@4035f2fe9c blender/blender@f22e62d69c
#125861 blender/blender@13ceb73941 and blender/blender@07f88ddd67 blender/blender@5b68e2a808 & blender/blender@548ade9e4b The first commit fixes an unrelated issue but is needed to apply the second
#125353 blender/blender@ca199ba13f blender/blender@a1f57fff93
#125375 blender/blender@8a812e334d blender/blender@025735cef7 had conflicts, used !126020 instead
None blender/blender@7084465393 blender/blender@2be7442332 goes together with the next ⌄
None blender/blender@7b8640896e blender/blender@2d2ebead32 goes together with the previous ^
#124876 blender/blender@9d797b834e & blender/blender@f2c728468c (eevee_instance.cc only) blender/blender@aca88b18bf
None blender/blender@5ce29bedf6 blender/blender@011b5ffbba
#125307 blender/blender@6b522c5e30 blender/blender@4cc8c8dabf
N/A blender/blender@6b848a9993, blender/blender@50ba7a3033 blender/blender@18a190f180
#125621 blender/blender@ed274e7a76 blender/blender@44bc217018
#125157 blender/blender@338140f1e6 blender/blender@2d52d2cde1
#126017 blender/blender@338140f1e6 blender/blender@2d52d2cde1
#124292 blender/blender@a9d318d2f3 blender/blender@6f515ee23b
#126005 blender/blender@ce6454d02f blender/blender@2f1dac1022
#126108 blender/blender@1fc6a5b9bd blender/blender@ed88722187
None blender/blender@7374077610 & blender/blender@48d55fb420 blender/blender@7a16c7532c These changes are combined in PR #125977
#125935 blender/blender@5a9fe638de blender/blender@7974023802
#124691 blender/blender@a451971026 blender/blender@0a0a770480
#125946 blender/blender@149825bc2a blender/blender@ff91e88d40 conflicts, resolved
#126101 blender/blender@4349d6b766 blender/blender@b1018e8386
#126160 blender/blender@ef2e1f8423 blender/blender@d6d7594714
None blender/blender@f30689e12c blender/blender@e40b2a1610
#125618 blender/blender@c4e90eddcb & blender/blender@925753c83b blender/blender@d29644e348 & blender/blender@bc423d7d3a
#124125 blender/blender@2641216344 blender/blender@750aefd4df Second attempt at fixing this after the first had to be reverted due to performance regressions
#126223 blender/blender@7fc55c0ad8 blender/blender@3b866d9acb
#125929 blender/blender@2449b12e67 blender/blender@0920e76baa
#125070 blender/blender@7207015a58 blender/blender@c8dea90d34
#126278 blender/blender@fec8591464 blender/blender@2f69d90f85
#126201 blender/blender@df00c30fcd blender/blender@1b24edbe02
None blender/blender@5f9be675f0 blender/blender@e0bd7709d5 goes together with the next ⌄
None blender/blender@f42713ab1d blender/blender@399ed8b653 goes together with the previous ^
None blender/blender@9f931ee3d2 blender/blender@de56588967 goes together with the previous ^
None blender/blender@9e09351b5b blender/blender@3476864e92 goes together with the previous ^
#124565 blender/blender@00be586a82 blender/blender@82494dde0d
#125504 blender/blender@1d37294d73 blender/blender@ed538a2cb1
None blender/blender@b0ec4bba70 blender/blender@9b251d04e7
None blender/blender@6e823d3f6f blender/blender@2d05f61e6b
#125401 blender/blender@717b8c08f3 blender/blender@323f88c0db
#106372 blender/blender@1a8053939b & blender/blender@e2bc41598d blender/blender@53f0c2c14d used !126088
#125169 blender/blender@28dd78457a blender/blender@8ddaaac502 Due to merge issues, here is a PR to land in 4.2: #126098
None blender/blender@ef010da315 blender/blender@5c67f9469b
None blender/blender@2724f296b2 blender/blender@82a26b72a0 Only needed to avoid a merge conflict with the commit below ⌄
None blender/blender@935c49f1cf & blender/blender@35198ec363 blender/blender@5a25535743 Only needed to reduce merge conflicts when backporting a later commit
None blender/blender@389b322975 blender/blender@e6b856bd8b Required for the next commit to function ⌄
None blender/blender@1330d0ddda blender/blender@fc52a49be7 Used !126401 instead
#125958 blender/blender@58c7237bbf blender/blender@2edeb11008
None blender/blender@f9a16c4cdb blender/blender@09e8e49365
This task is a management task to track the commits and fixes that will be or are already applied to Blender 4.2 rolling release. The process is documented on https://wiki.blender.org/wiki/User:Jbakker/projects/BlenderLTS/ProcessDescription NOTE: When changing this task please make sure to stick to the markup. The description is parsed to generate the release notes. * Final commit of initial release: * Last merge of `blender-v4.2-release` to `main`: * Last checked commit in `main`: ## To Be Backported NOTE: When adding commits please add the repository prefix to it. The release note generator requires the prefix. NOTE: When adding items, please add them to the bottom of the `To Be Backported` list (**not** the `Blender 4.2.x` list). NOTE: please leave a remark if a particular commit needs library updates in the branch, e.g. #109771 NOTE: commits are checked for having followup-issues (skipped for release in that case), if there are other reasons a commit should not be in a particular release, please also leave a remark (or remove the commit from the list again) | **Report** | **Commits in `main`** | **Remarks** | | -- | -- | -- | | #124621| blender/blender@3fcd80db682588d1796f5354e08889cba16b3bb2 & blender/blender@d7a7491518eb8907974cce19b26834d4af590e3c and (hopefully last) blender/blender@2718f24b5c5a7fb0849335921e7a46c52338be3b |The commits changes the look of transmissive materials, don't backport yet | | #124642 | blender/blender@e7ce8d33e30203c61c4cf296f6278af17158f052 | [May not be suitable for LTS](https://projects.blender.org/blender/blender/pulls/124673#issuecomment-1249851) | | #117367 | blender/blender@86e7668b1104 | conflicts (probably misses blender/blender@0089a90625dd in 4.2?), prefer if @Scurest / @Aras check | | ~~#126147~~ | ~~blender/blender@7597f494b9~~ | ~~conflicts because of a9a047c0e3b9ec69284a96af0c1d04e5314d8fce, prefer if @mont29 / @jacqueslucke check~~<br/>Did not realized SharedData for PackedFiles was not in 4.2, this backport is not needed then -- @mont29 | | None | blender/blender@89c389c465b6bc6046c8408627fde7c186639f08 | | |None| blender/blender@a9bfca5483dced10e685513811a9db535bf28967 || |None| blender/blender@00bc0598945d2db796e783f3bcc96fc95443c9f8 | Must backport blender/blender@89c389c465b6bc6046c8408627fde7c186639f08 first | | #69164 | blender/blender@46cd88f229c90d87d7528ad3e0169ec5229c6dfb, blender/blender@d254a0886edfe757f0233e2bd9753421c82a0bcb, blender/blender@5387605833e3f7ddf07c2bdb7bc01860290a3f58, blender/blender@24dc9a21b1fee24c87442f1a15598d34c9301507 (partially) | See PR !127548 | | None | blender/blender@e2421576740a9e538c6c0c6382b83353a03e8c8b | See PR !127550 | | None | blender/blender@8b5f3c46714d5fe7cae75f0c884556fdec023faf | | | #127213 | blender/blender@f5b16e474fd221357e8b97898672322987df048c, blender/blender@2954323c2d6664db114a208ecb1d32d29b061813 | | | #126792 | blender/blender@6822e61c6f386ba94b55bbdecdd84f89bbbc6d61 | | | None | blender/blender@e6933e526c5fa0793acae007f137b62d4a778466 | | | None | blender/blender@630eff9b5ea52588ab8d0ecd83893dd989757b53 | See PR !127672 | | None | blender/blender@bf7c52cfd522e94e5ee8dffe6f6ccf653c465d7b | | | None | blender/blender@a396b2cceeafaf53c3124df40fe42ab4f927359e | | | None | blender/blender@92febd5fb21912c3daf4e813072acc79df36849f, blender/blender@b8f236510d944eac395a2cac2ee2cd36f79b4aa9 | | | #127636 | blender/blender@0311d8082b72932ba18d20e0143a165a67c921f9 | | | None | blender/blender@8345ebc70481edfaff21579c5225821a5842f656 | | | None | blender/blender@8345ebc70481edfaff21579c5225821a5842f656 | | | #125093 | blender/blender@d300098ee5b85e1dbd2cd26d6a90c58850b706be|| | #126524 | blender/blender@0d9ab189d1e016b06c6369bd7655e4674ae7d868 | | | #127654 | blender/blender@bab4f7a0cdd6a | | | #127590 | blender/blender@9c54ddff6907f0c194fcd63b0c46f45667b87b80 | | ## Blender 4.2.2 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #105895 | blender/blender@92f633e7cbd67cdd202139849e2666b0012a618c | blender/blender@973944bd969 | | | #126483 | blender/blender@975dcea23f0ad5919d3530e5c8173bc2eac1dec6 & blender/blender@994e14b000d2facf554dcac2c7e1d8a299f7afea | blender/blender@287e8327692 & blender/blender@ebb678d7aa1 | | | #126419 | blender/blender@0c6365ecade63ec3b6c3a732d836e97a189420a5 | blender/blender@a87c58d2ca1 | Clonflict:`BKE_paint_brushes_validate` -> `BKE_paint_brush_validate` | | #126494 | blender/blender@0d4e2ea40dfd049e9a99d7f911e673a890beb720 | blender/blender@7c40204c75f | | | #126450 | blender/blender@7dbff95070f3bf8e3168ff6334ccb6c86a2fdd11 | blender/blender@b2e42517898 | | | #126526 | blender/blender@399498fdc0c2d60a205a5ca4137dd67e0124860d | blender/blender@2aac428a2ec | | | #123405 | blender/blender@a51f6b692351012ee70192258ba677c5554e38df | blender/blender@871e5b1c322 | | | #126551 | blender/blender@d6ea01bd384cdc9dd49b63ca2ade4a34e663a157 | blender/blender@6f4d5f0e3b6 | | | #124832 | blender/blender@ddcf5bac44d2b6a065a8a770fe9f7f145a2de372 | blender/blender@45744122fa6 | | | #124693 | blender/blender@bf529e248a229ab99bbac75d92034fa747d3e005 | blender/blender@cb66ff5c5de | | | #126552 | blender/blender@844d6d2df08bcca0a2b5b7c90fc75bedbed88a18 | blender/blender@54f19d79f71 | | | #126324 | blender/blender@ce82d4434f4ad9c7f4cb2a008c0c7edc75fafae5 | blender/blender@329e8d2eb27 | | | #126595 | blender/blender@93546768bab46c81590df8a51d9023b0f7791de8 | blender/blender@85d47f54868 | | | None | blender/blender@6c82c039db24fc47de0ec6574338a4023c3390df | blender/blender@2c9e26acc56 | | | None | blender/blender@e00b7c4ad429f98950684656d6521130e0d18901 | blender/blender@70475861cda | | | #120950 | blender/blender@1b23a8983d | blender/blender@826ca2fd4a2 | | | None | blender/blender@0f2f9cd23025769e3ad8b3eac23b0c15e21503cb | blender/blender@e877bedac72 | | | #126556 | blender/blender@7391810b53e8034ad7ed299886778a5339d98a2b | blender/blender@3e00bea76be | | | #126412 | blender/blender@529c720457b447d802a495ab8e8e8b8bd971a3db | blender/blender@ddf37910f90 | | | None | blender/blender@16bf67cf37e8e6e71cda85b34d45317821eafc6f | blender/blender@1e9ae10e904 | conflicts, resolved | | None| blender/blender@765052fdb8fac316f2db197a32c5a8464fa9f0e9 | blender/blender@c3916026773 | | | #126567| blender/blender@758401c6720d64a7fe5cb616ee44ae32107915f7 | blender/blender@60a36354906 | | | None | blender/blender@92d935a2059e99dd4cbfcf18c14870ee77476ab2 | blender/blender@fc31352b706 | Compilation error fix for MSVC 17.11 | | #126459 | blender/blender@0d4c76c9862508e092b007ea6be5be129d20107a | blender/blender@b1b1860dcab | | | #126351 | blender/blender@0bad30317cdf7033d11b52bb6c8b25cd30d6a179 | blender/blender@93343f5a9d2 | | | #124752 | blender/blender@58bd3d40ee20d105bbcbe09f8d1ebf3d4075b1dc | blender/blender@808ad059f3c | | | #125184 | blender/blender@3a81bde89686ee6fbde4fecfa49fbe4e31a90686 | blender/blender@71d04871183 | | | None | blender/blender@6bd515e0d2a2040f903775b1afc7cf38ebbcb378 | blender/blender@f50e4cbb62d | | | #126734 | blender/blender@d63db15fe9e7a5ea184de231b33c418dcd02d650 | blender/blender@3adc0f29e55 | | | None | blender/blender@798fbe7dbd45c30d222df08a96c42fdaf2302dd6 | blender/blender@7ceedb5f4c3 | | | #123787 | blender/blender@78af1722cfc198258e49b82439ce2243a2c469e0 | blender/blender@35ed57eb2ae | | | #125333 | blender/blender@dc8f5d5b898f0f9dfe57f8149e7fc575d3dff12f | blender/blender@9db4d55a43c | conflicts, resolved | | #126535 | blender/blender@d2c38d3fdc1d5a4f0cc9b3157ab50ab85bf0cf3f | blender/blender@f04dd896e89 | | | #126573 | blender/blender@d9cfb9fea25af226d2b545f3a5325289dbd65388 | blender/blender@216bef634ca | | | #126225 | blender/blender@41da774dd050eb58463160c16acf36c9f89e67ef | blender/blender@4f8c4b588b4 | | | N/A | blender/blender@92733a94154a3958495092e798e1c34664f467da | blender/blender@357fb5c5ffd | Fix memory leak in Cycles HIP-RT | | #126677 | blender/blender@1dbb88070b25779821ac00cbadeff9506f4c4365 | blender/blender@dec9fefeb5d | | | #126798 | blender/blender@82a42915968f514faf77edb76c7a2ed656a0fa44 | blender/blender@54f10c31b18 | | | #126856 | blender/blender@d1f0084a336332c7258ae91d76bdc0ea2129fc56 | blender/blender@2c1f83561f8 | | | None | blender/blender@db5cd39a677e2a374dc0f76f0d6bb68221a50082 | blender/blender@fb14083ff54 | | | #126633 | blender/blender@2cc395be064b7663d30aff668f1f2dde894968a3 | blender/blender@8909836fa88 | | | None | blender/blender@86f2c120f2c9549217aa68dc6b2f75c2dcfe37f5 | blender/blender@574d096f784 | | | #126852 | blender/blender@0f3793205d2b554442378d1135885714fdf99c26 | blender/blender@9f14211e6a4 | | | None | blender/blender@42840ded01948b9820389313551cb68c3f77e0ad | blender/blender@fc9b876f25a | conflicts, resolved | | None | blender/blender@6191eb1e9df0637b22db805de6b97db40321b5e7 | blender/blender@e38cda52808 | conflicts, resolved | | None | blender/blender@7c6975f6c88ffffda4e9514265ae4ebf9ddd5e27 | blender/blender@4f660c3b2c6 | conflicts, resolved | | None | blender/blender@69ab986370d989ff0300ecfca4eefa2eb93eb7f5 | blender/blender@f82b50654ab | conflicts, resolved | | None | blender/blender@780721de1949256d367448e474ca963890e0d473 | blender/blender@f59641b6b04 | conflicts, resolved | | #126986 | | blender/blender@325ed460a75033f56875e773db0ce4ee2a1bf604 | PR apply !127068 | | #127022 | blender/blender@c4a67ec3c72b3790 | blender/blender@212ee520824 | | | None | blender/blender@e5e5d5fe73242a7bfd250ecd2bb1e6941d2db87c | blender/blender@b22dd61a47d | | #120861 | blender/blender@e9333c82aba32e8f49bc893459cb3e69b9fb4ba6 | blender/blender@89d1bab74be | | |#126799|blender/blender@77035192c98c709f98eacc915ad48189200309d3| blender/blender@99d80a0b490 | | |#126038|blender/blender@2afb9e3d95cc62a005e532bb4eefbb7476a7f9f5| blender/blender@05c2d8d8106 | | | None | blender/blender@790333578bbe318a58d524b1b6ea0bdce3559920 | blender/blender@374da29f6aa | | | None | blender/blender@787eb2b4339fd49431b6de87c97e6ba0b31c1791 | blender/blender@50506c79455 | | | #127085 | blender/blender@324e1441a22e841d6bd674b27e0efd9bd2aeceee | blender/blender@84b8c070896 | | | #126908 | blender/blender@174387e4d905379bbdcb7b6a2513ed249c11e927 | blender/blender@849f91415c9 | | | #124811 | blender/blender@94c9898f417f43f86349c35ed8d36e38d8ae7fe8 | blender/blender@ac477fc15f5 | | | None | blender/blender@1a0dbbd242c0288e710953c885841c28e308b8f4 | blender/blender@b72ad1209a8 | | | None | blender/blender@9d3ddf6a04f8cc8e6d898c3d0ce6e8607f791b5c | blender/blender@7bc471630b0 | | | None | blender/blender@8db818527629f1a4e29c803286120725f60bc0ec | blender/blender@0b42a3aabc1 | conflicts, resolved | | None | blender/blender@36415cfaad8dfe94ab2a7af0a37e4ffc1e04e81f | blender/blender@a9745f2a16c | | | #127012 | blender/blender@7bb8ab81946ef033f9315db32e6c6f5138abdb64 | blender/blender@8d1dcd59c9c | | | #123138 | blender/blender@acde253b9daaa661c2d64713dceded3cde9f3407 | blender/blender@80fa49f24ae | | | #127165 | blender/blender@1235404cfe9cd4c7397ae80ac9614dfd31bcb6b0 | blender/blender@99ba15adff3 | | | #127039 | blender/blender@75d5e69d44ebc539aa84e1e55463f1f45ddab7bb | blender/blender@2640f043296 | | | None | blender/blender@8febf15ea59411ff7badc49fa595f8178935f9ec | blender/blender@73c27fd6509 | | | None | blender/blender@73ac0275c6e60d3205501f88c429d356a66566a6 | blender/blender@b49c8bd8dad | | | #127319 | blender/blender@0358a3d11f881afd8b38ce20ff7e73d5e5fe67ae | blender/blender@46f157ff72b | | | #125506 | blender/blender@d3909d42c633cd43b35d679dd696c0020758bdb7 | blender/blender@1da18460667 | | | #126463 | blender/blender@0db13bef196c3fa7476b1282d1c271dc72ca44da | blender/blender@21bea714fdb | | | None | blender/blender@62dbebc18e89ee5da846090443a8c404d8c7d777 & blender/blender@9d6ecd0ed6dfa68399f7718c7e5b92ff695c6741 | blender/blender@fcc87f44886 & blender/blender@afb9b0ae054 | | | None | blender/blender@d122d19f00c667d7badcc3eabd12d62229f7b57b | blender/blender@f06c7a50c63 | | | None | blender/blender@2593fffa4d93716f1de700bd910e1231f7b83051 | blender/blender@0cb427c9119 | | | #127329 | blender/blender@54153629f4c7c9017588f30946f2b806dd448a66 | blender/blender@55bd057497b | | | #122837 | blender/blender@5f343382968a86c312a08266957a5e04d3ceb746 | blender/blender@37a3eb5aa21 | | | #126821 | blender/blender@4c2718e318a9db47eb42d6dcc656c92b2cc47c2d blender/blender@e18aa659731e9ddd2a32f65a5d24b1460e49b1cb | blender/blender@1479bf6eeca & blender/blender@6f672295a55 | | | #124549 | blender/blender@c41bb20008747e | blender/blender@a33ff3eafd8 | | | #127142 | blender/blender@3915a84fc6d46464e3f015612bd531bba8948a21 | blender/blender@4b8fbd8c2f4392f0511d692a3422cc0d6ddafa32 | Used !127149 instead | | #126706 | N/A | blender/blender@252cc7839f1405be981973fda22e8cb7ac68fbd2 | PR to apply: #126894 | | #124167 | blender/blender@a5970b8248b0d7d10a356687127a1126a6f12f2f | blender/blender@06b9a46edb | ~~"Note that I would consider this very scary to backport to 4.2" in blender/blender!125084, needs clarification @mont29 @JulianEisel <br/> `I would rather wait for 4.2.2 to backport this one` - @mont29~~<br/>Backported through blender/blender!127696 | | #126549 | blender/blender@6e143cbf75 | blender/blender@638d950f64 | ~~build errors in debug mode (buildbot apparently catches these) because of missing LIB_EMBEDDED_DATA, prefer if @mont29 checks~~<br/>Backported through blender/blender!127700 | ## Blender 4.2.1 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | | blender/blender@bf738fd35afe7fa2c79c24ac44f6ea97dc3ac8d7 | committed directly to `blender-v4.2-release` | | #125063 | blender/blender@9427ec3f400375fd72b0b3fea9ea38ac2a91edb9 | blender/blender@1b7485f208 | | | #124020 | blender/blender@fd5780e97b94badd193af69d3406d136b889fb40 | blender/blender@23fc0d53e14 | | | #124431 | blender/blender@96cc9109fdb321307443bcfc8d5dd13a47f38e6d | blender/blender@57b6d3eafc8 | | | #102994 | blender/blender@5705065db1f48717c1797525e639ca70ac166994 | blender/blender@0785c6129c1 | | | None | blender/blender@10b871a211cff71b8e198ab205998c66dd2e024d | blender/blender@5bf1be8f51c | | | None | blender/blender@0b0481cf540145adaba1a26e7c7ea78f65bdb1dc | blender/blender@c3268834d79 | | | #124637 | blender/blender@71e1305b0634a812f4de4e450a32574fc999d496 | blender/blender@7a8cdde2fd2 | | | #124625 | blender/blender@649fa05bcb8d32a8586e0df04a01ab1f4367e516 | blender/blender@46fbb6ccfeb | | | #124705 | blender/blender@cf96136ec6cf9ec9753a2ea568d3f233b5152e4d | blender/blender@4a32a104c49 | | | None | blender/blender@471a148666092cf21ab04797c2caecf64152dc87 | blender/blender@4f6a5f963cb | | | #124552 | blender/blender@e7fa847bba020d0dc06d50d8e84a9235e2de9396 | blender/blender@12e6d73a44f | | | #124745 | blender/blender@138e914346166e4a3c1d0c3e6007dbd6e6fe2d81 | blender/blender@264c55c2db1 | | | #124817 | blender/blender@7438bf8e0fb6a15ac3594695da5be799d2e0ca1d | blender/blender@35f6a7b94a9 | has versioning code | | #124868 | blender/blender@aac0189e2c40abd65a56a22277310d8ef23d5898 | blender/blender@fc47e12eb6a | | | None | blender/blender@4f46493eaeb527281f49ce41ece860e3cd3ade68 | blender/blender@7033d9bcf2a | | | #124850 | blender/blender@c7a26cf5c27e8d54b5fa23c6ce14f296ffccdafc | blender/blender@e3ba59c4f6a | | | #123096 | blender/blender@80f0c613c0797f2cd8dd7d7663de2da93f50a3a0 | blender/blender@06aa7eb929c | | | None | blender/blender@4000e1f2f259d5c8c3aaed2abf4def31aaa160d0 | blender/blender@1f12bd3c492 | | | #124501 | blender/blender@5f54c463c0e57982412dd2aa8929f3cc4853606e | blender/blender@eab80f98190 | | | #124931 | blender/blender@604dc2cc33d00ef4ed8425260d97d1b08f7c8362 | blender/blender@bac5ab1d4f7 | | | #124589 | blender/blender@7a260b761dd3a5415c344a794ede7b9206317d78 | blender/blender@e16272f8de2 | | | #124623 | blender/blender@63db751cde93c45d64c5e678cfaf6d88e3b7d15d | blender/blender@20cab1cf111 | | | #124767 | blender/blender@6a39d79967b3c02e0e4d0a8cc3bf6cc7f274d737 | blender/blender@261982da386 | | | #124990 | blender/blender@71e1d795b35458eb4aada9992c21b7d08fa2a22f | blender/blender@9dd1edb5ef9 | | | #120465 | blender/blender@cb4aa93480f7c88b3923809ce3fbee8f55a2c363 | blender/blender@611fd4640fe | | | None | blender/blender@a6167996075d876486e264263f3d3d81e9c37f5d | blender/blender@de1806f4154 | | | #120253 | blender/blender@fe1bf4897dacd9b74f0e380a2258ddab6de1a82d | blender/blender@9c48a5e476a | | | #124769 | blender/blender@9a568f22279d149178b24a6825140664e1710277 | blender/blender@17c47b9a69b | | | #125202 | blender/blender@d40c2705a17847f65aad21cf85f3b30751ac34a1 | blender/blender@e696590ce17 | | | #125142 | blender/blender@68c2c9cb26ad0bbb516f17e9d477ae645279d671 | blender/blender@27b629a82cc | | | #125023 | blender/blender@d4aecd93e789012f9cb1374461f2b2c3e8b694f4 | blender/blender@6aacd9fa560 | | | #125006 | blender/blender@d5d64f4a9f7d80223417905bd243c28c425e545d | blender/blender@2e53ea7d77e | | | #125168 | blender/blender@90e83175ebbc317b40cad8ff2405fe4037152a4a | blender/blender@d773dea6a7a | | | #125134 | blender/blender@6d302ca7ca013bdd74e5d8bc89f83b87855bffc0 | blender/blender@8496cca34c3 | | | #124885 | blender/blender@f3a0ecb4e25675113d90426dd10373b771c84bf4 & blender/blender@1aa37c8df273128866e661e2008400b237e7525d | blender/blender@a480c50ad6b & blender/blender@9f53425eb63 | | | #125046 | blender/blender@38766fd018c7aa36e4b54b2f0f1c74a3afdedff1 & blender/blender@bc2e47622f4796a31082ee6a3709d5f9b880bcbb | blender/blender@0ecaa6631ea & blender/blender@54951b1e19d | | | None | blender/blender@3d0db481f49443b212ae205d4384bd9ce423d8b2 | blender/blender@d3d22496bc2 | conflicts, resolved | | None | blender/blender@0c836f7f1a9a6d5f31140ae505c4cc65f3513cab | blender/blender@ee3d935debe | conflicts, resolved | | None | blender/blender@0e881a777253807a24e1cabcd78eccf8d49ef6fa | blender/blender@6c8510f0c0a | conflicts, resolved | | #125112 | blender/blender@c46679c108a22792377b07afcb41c71d7106e5e9 | blender/blender@7fff1ab3a8a | | | #125319 | blender/blender@6e152df547cd1f323ffce729fe17572dc16b773b | blender/blender@c8aaaa4daac | | | #124859 | blender/blender@46d0e8acbefb5dae111716b5e35e668f2e813f65 | blender/blender@af5ff37dd5f blender/blender@92149a4a284 blender/blender@6377142b8aef83a79fcc8b2fb9d30c16324f9b07 | Requires platform maintainers to rebuild libs, an early back port would be appreciated | | #125061 | blender/blender@527e55239bf96 | blender/blender@0d89a63ca5e4f | minor build failures resolved | | #125043 | blender/blender@6432d54ef725d | blender/blender@ddaddef5c42a | | | #124922 | blender/blender@160f27330f23d | blender/blender@c15c74f9193cb | included tests/data submodule update | | N/A | N/A (completely different fix, blender/blender@a62f1dc6cc) | blender/blender@449c4fc72e | From PR !125003 | | N/A | blender/blender@813c18e39c5 | blender/blender@c2c3ccb42fe | | | #125466 | blender/blender@7fcd4e2429 | blender/blender@174f8de75e | Fix in `main` different from release branch fix/workaround | | #124859 | blender/blender@2bf5a12e3b513e759953e6d11afea1d045d74007 | blender/blender@c10d9a556f085ae65da2a1049ce400e25b26e575 | | | None | blender/blender@7374077610067becf67f79e8cda6bdc1c0cf90c3 & blender/blender@48d55fb420ebc75d3c69e7328ae27d03248e9eb7 | blender/blender@7a16c7532c961d908f3339ab40b8d00e7d283943 | Committed directly to `blender-v4.2-release` | | #122858 | blender/blender@13f27ea0ae9e153e0470b1b4042a1ba2484aa035 & blender/blender@4cf9f53946097743a6e7e5980b8be2514587c880 | blender/blender@1d61869970e & blender/blender@6dd6563aa47 | | | #122754 | blender/blender@8da807684ca49ecd03a69755794d63aa73ab7cde | blender/blender@0a970a3a0ea | | | None | blender/blender@32c721767ed91957b9418c49a224f8b01cfe93fa | blender/blender@04d8595e55d | | | #125340 | blender/blender@6041bdd93a996b40a1a7cce91712a5071e198ee8 | blender/blender@4459944ca73 | Technically applicable for 3.3 LTS as well | | #124899 | blender/blender@d80f0aa068 | blender/blender@b535e5c2d7e | | | #125064 | blender/blender@163baad17ebcf656be68cbc0fe7997c297ee799a | blender/blender@54eaedd889c | | | | blender/blender@c13c502624f6da4e5dc94a01a0f76209f6e9c297 | blender/blender@f49b57811e5 | | | #123735 | blender/blender@0baeca8f9e | blender/blender@17b48ee22d0 | | | #125404 | blender/blender@37fca25820f35308e5e25120df21884498abdf75 | blender/blender@651fe704e92 | | | #125395 | blender/blender@1c69154aaf033730a9e3882574d56ca6597b84ae | blender/blender@f51e188dc28 | | | #125395 | blender/blender@1c69154aaf033730a9e3882574d56ca6597b84ae | blender/blender@f51e188dc28 | | | None | blender/blender@8019ad891253b94d77487e20529856c451170fd5 | blender/blender@778524fce37 | | | None | blender/blender@656fe6d3e40041616fbadd7a191011fe99a1ddbb | blender/blender@0f24fd7756a | had a followup commit, see below | | #125763 | blender/blender@f8e06a5f5fa07961091158c7da24fbd9c7eac519 | blender/blender@b99980b485b | | | #123179 | blender/blender@0dad3bdfa7b3f42390dab56dd99ae5f4f98382d2 | blender/blender@09ae4bffc24 | | | None | blender/blender@d610ae2764d57963543792dcda5769ab4861cdfb | blender/blender@451ee89c48a | | | #124836 | blender/blender@8b3beeee82f3ec99045b8ea14e368a7124279ba3 | blender/blender@02e1efd3ab5 | | #125446 | blender/blender@b17734598d | blender/blender@6febc4d6b57 | | | #125588 | blender/blender@7903aa6faa3399f7beac1e89144aa731f76e8954 | blender/blender@4bbe5454535 | | | #125400 | blender/blender@a26819ad88c60d7508b16b690d931b5efd53e6ae | blender/blender@7af629a25b6 | | | #125402 | blender/blender@69154a5e3b8509a2d73802e890ff67b95a968284 | blender/blender@90e21c365cc | | | #125607 | blender/blender@0cf688401b7f0d125c1c55ea896e0569ef208c27 | blender/blender@bfa793a11b3 | | | #125636 | blender/blender@fc8341538a9cd5e0e4c049497277507b82237c9a | blender/blender@2bcc7cff412 | | | #125660 | blender/blender@3a88af540291f81aa2da2f9e30101fa04b26901d | blender/blender@a6222ab8b93 | | | #125226 | blender/blender@ba1f7caffaca808d047899694bbc602e2c6bd4de | blender/blender@d00807a1350 | | | #125387 | blender/blender@0c429ee652e9c6787dd816ac833a8a8783969917 | blender/blender@85cc88a262e | | | None | blender/blender@2cf09525a795588c2af606ff95a1d62686e7182d | blender/blender@623e196f67f | | | #124731 | blender/blender@14b03fca3c3c6a24da58278373093ae9451e37c4 | blender/blender@72da916b096 | | | None | blender/blender@ef505727c6b8bda549c98e9ecfea94fbeea0ea97 | blender/blender@93be30b2172 | | | #125672 | blender/blender@0b97228cbcbda57db0543e92e27fdf7330e6bf9b | blender/blender@03201d9216b | | | #125232 | blender/blender@4d85c03815c62f706a7211da18f5a09cdcf31fcb | blender/blender@9d35a4bfa79 | | | #125509 | blender/blender@a2b53f47dd | blender/blender@8b18cf0d2bb | | | #125542 | blender/blender@06fab9f8f1 | blender/blender@1bae2fbf3b6 | | | #125185 | blender/blender@644e7bf30943bc0ec6848afc6fab375fa594e942 | blender/blender@2608c887f27 | | | #125750 | blender/blender@5b61a01c19cbc0c0a96f2bd1368a9ab920990f4a | blender/blender@0fa0cb84bd2 | | | None | blender/blender@805f66c5c4821ab045067a93043be571ea5fe0d5 | blender/blender@fdbb8efa9d6 | | | None | blender/blender@afa44b16a64d8c2ccae5af79cf91c80b187d5967 | blender/blender@9c3ade79f27 | | | #77837 | blender/blender@fc6a99e0d27171f4e1c1a0fddb7e2a3ab722315c | blender/blender@e1b5ca0bd18 | | | #123327 | blender/blender@7fcd4e2429b829b4ea85f3f763face4163236d8e | blender/blender@174f8de75e | A proper fix was committed to main with 7fcd4e2429, this is a 4.2 specific workaround that is more minimal and safe, also fixes #125466 | | #124702 | blender/blender@c90f13f2b34bb3c078f6ba0c37295e6777e66cc6 | blender/blender@f7d6f499b7f | | | #122454 | blender/blender@09390858abb9f58667cd4bf8d62125571d921a54 | blender/blender@cb8fe2bcd53 | | | None | blender/blender@9c622d3b2baab56dcf1526111e8b3d5901230cc3 | blender/blender@ee025327a55 | | | None | blender/blender@5110833ff1e17a83bd9c4d2abe2b0616dd25ae95 | blender/blender@d255681e9c3 | | | #125826 | blender/blender@4035f2fe9c0c2e16f1ebb3aa2b320f5b482b9e7c | blender/blender@f22e62d69c8 | | | #125861 | blender/blender@13ceb73941 and blender/blender@07f88ddd67 | blender/blender@5b68e2a8089 & blender/blender@548ade9e4bc | The first commit fixes an unrelated issue but is needed to apply the second | | #125353 | blender/blender@ca199ba13f7f400fb42705fe01f2bdb803d33ceb | blender/blender@a1f57fff93e | | | #125375 | blender/blender@8a812e334d07fa8be186bc66f5a14a9ba86e702d | blender/blender@025735cef715265a5eec4eacfc1ef4d497fd6764 | had conflicts, used !126020 instead | | None | blender/blender@7084465393c38ac533a6403f8f85fa3b8dc1334b | blender/blender@2be74423324 | goes together with the next ⌄ | | None | blender/blender@7b8640896e1c36d5cf99a88dd5eedaa5d03df51b | blender/blender@2d2ebead32e | goes together with the previous ^ | | #124876 | blender/blender@9d797b834e86e3ab1957a9bfbf31dceae9d091c4 & blender/blender@f2c728468ca3f5a8ef31cc6bbb6fd51e6782aa61 (`eevee_instance.cc` only) | blender/blender@aca88b18bfb82444979f91a965034da683df7719 | | | None | blender/blender@5ce29bedf63054c0487913ae2b15f7617d95d1f7 | blender/blender@011b5ffbba4ac7a830bc6ec6a43fb8af408ec71f | #125307 | blender/blender@6b522c5e3067e512bb00ffa7c12b1b523e2c3204 | blender/blender@4cc8c8dabf5df7639ce963d72fb4461ad3613e42 | | N/A | blender/blender@6b848a9993c8cf1996822e81dcc1a1bea4da4d95, blender/blender@50ba7a3033016173f32be346a27d9d7d520ae590 | blender/blender@18a190f1806c3ca8a0e8095f9264839b1f73569b | | | #125621 | blender/blender@ed274e7a76ce715556077feecb48cc54295f21d4 | blender/blender@44bc217018eb93da6c98d0b24f46169f9ed71b42 | | | #125157 | blender/blender@338140f1e68612ba6756a016296ddc93ffc973dd | blender/blender@2d52d2cde1679505acde85293d1c89c14eb1a302 | | | #126017 | blender/blender@338140f1e68612ba6756a016296ddc93ffc973dd | blender/blender@2d52d2cde1679505acde85293d1c89c14eb1a302 | | | #124292 | blender/blender@a9d318d2f3eb75c6760977029c8ad9bc4819611d | blender/blender@6f515ee23b87cf728947896f806d620312834e67 | | | #126005 | blender/blender@ce6454d02ff856655fd29d4f47632c59096e945b | blender/blender@2f1dac10223f0bb1e3a28d72151ff422dbb80514 || | #126108 | blender/blender@1fc6a5b9bd5f7d2763ba4a83f52bbbbcf242170b | blender/blender@ed8872218756ce38e7e8d9981c1a27c8dd6014ef | | | None | blender/blender@7374077610067becf67f79e8cda6bdc1c0cf90c3 & blender/blender@48d55fb420ebc75d3c69e7328ae27d03248e9eb7 | blender/blender@7a16c7532c961d908f3339ab40b8d00e7d283943 | These changes are combined in PR #125977 | | #125935 | blender/blender@5a9fe638dedb179050c4929ea8fcdec80d221af2 | blender/blender@79740238024 | | | #124691 | blender/blender@a451971026 | blender/blender@0a0a7704809 | | | #125946 | blender/blender@149825bc2a | blender/blender@ff91e88d40d | conflicts, resolved | | #126101 | blender/blender@4349d6b766c3c73a75029e25b76bab8e180cebb0 | blender/blender@b1018e83866 | | | #126160 | blender/blender@ef2e1f84233d248b59e07e55efb34af8b461265c | blender/blender@d6d75947141 | | | None | blender/blender@f30689e12c67edec3d89caadc8f0c92a09db3bcd | blender/blender@e40b2a16106f7f5b7caeb95b4cd07bb1dfa92028 | | | #125618 | blender/blender@c4e90eddcb3c4240e2589596cc2180496691381c & blender/blender@925753c83bfcdc5d9f6899e882c5705d049d7eaa | blender/blender@d29644e3483 & blender/blender@bc423d7d3a4 | | | #124125 | blender/blender@2641216344 | blender/blender@750aefd4dfb | Second attempt at fixing this after the first had to be reverted due to performance regressions | | #126223 | blender/blender@7fc55c0ad86959265da27895e3f5619c9209da13 | blender/blender@3b866d9acbb | | | #125929 | blender/blender@2449b12e672f59ce0fff1e691353ad6cf1f6d557 | blender/blender@0920e76baad | | | #125070 | blender/blender@7207015a58a350187966efd8efa6f7a328cfedef | blender/blender@c8dea90d34a | | | #126278 | blender/blender@fec8591464fc965753d287f1767858ab1f90ef3b | blender/blender@2f69d90f85c | | | #126201 | blender/blender@df00c30fcd1f | blender/blender@1b24edbe02a | | | None | blender/blender@5f9be675f072d7883e7b78a4555123034ce3bd75 | blender/blender@e0bd7709d56 | goes together with the next ⌄ | | None | blender/blender@f42713ab1d1163fae65cb265fd7b5e2d261aab60 | blender/blender@399ed8b6533 | goes together with the previous ^ | | None | blender/blender@9f931ee3d266551ba33a9e92a2796f0ccc97ee9e | blender/blender@de565889672 | goes together with the previous ^ | | None | blender/blender@9e09351b5bad750927596e36d0159d4a0bb1b513 | blender/blender@3476864e92f | goes together with the previous ^ | | #124565 | blender/blender@00be586a8200c5cf01c8e5a709849cad7ce9ac60 | blender/blender@82494dde0de | | | #125504 | blender/blender@1d37294d73c346d407eba742589d7f82f5562570 | blender/blender@ed538a2cb1f | | | None | blender/blender@b0ec4bba70885ca13fc8bd125fcdbad875a52090 | blender/blender@9b251d04e7e | | | None | blender/blender@6e823d3f6f1b1a64feaef07c632b34b72bc8faa4 | blender/blender@2d05f61e6ba | | | #125401 | blender/blender@717b8c08f313750ae052597fc577ba5abe3bb0d2 | blender/blender@323f88c0dbc | | | #106372 | blender/blender@1a8053939b & blender/blender@e2bc41598d | blender/blender@53f0c2c14d8d97d90c5fc16bb386fa79f2d56b0a | used !126088 | | #125169 | blender/blender@28dd78457a | blender/blender@8ddaaac502361575b4c5819017ee66394fc2d673 | Due to merge issues, here is a PR to land in 4.2: #126098 | | None | blender/blender@ef010da315b596edde5aaf9d8d60101ca3a64373 | blender/blender@5c67f9469bc | | | None | blender/blender@2724f296b21e13562ece5a629b38252fa239e2df | blender/blender@82a26b72a0f | Only needed to avoid a merge conflict with the commit below ⌄ | | None | blender/blender@935c49f1cf97628d45a24ecee8c64a2e1f397f3b & blender/blender@35198ec3633318cae4d203246ef044d7b6f1fee9 | blender/blender@5a255357434 | Only needed to reduce merge conflicts when backporting a later commit | | None | blender/blender@389b322975947d97106ec52634312e4afb474cfa | blender/blender@e6b856bd8ba | Required for the next commit to function ⌄ | | None | blender/blender@1330d0dddac11043969f0d27a65573a8acab0756 | blender/blender@fc52a49be772e883e2db2de485fd4f8e5b0d97c3 | Used !126401 instead | | #125958 | blender/blender@58c7237bbfd3c47ea745fee8ed57556790620261 | blender/blender@2edeb11008d | | | None | blender/blender@f9a16c4cdbae7b7cec7077f48d3d7f1909b2b587 | blender/blender@09e8e493654 | |
❤️ 3
Thomas Dinges added this to the 4.2 LTS milestone 2024-07-10 14:35:41 +02:00
Thomas Dinges added the
Type
To Do
 label 2024-07-10 14:35:41 +02:00
Philipp Oeser self-assigned this 2024-07-22 11:31:30 +02:00
Philipp Oeser commented 2024-08-07 09:53:14 +02:00
Member
Copy Link

@dfelinto I assume

@ChrisLend , @Sean-Kim : I had backports with seemingly non-trivial conflicts (check the To Be Backported list), prefer if you could check and make a PR targeting the 4.2 branch if possible)

@dfelinto I assume - by blender/blender@ba1028806aabc0ca33c3cddf4616d05f83e7289d [which is not in main] you mean blender/blender@7084465393c38ac533a6403f8f85fa3b8dc1334b ? - by blender/blender@fc26da9e909bba60008d6ea620fe6270be3c089c [which is not in main] you mean blender/blender@7b8640896e1c36d5cf99a88dd5eedaa5d03df51b ? @ChrisLend , @Sean-Kim : I had backports with seemingly non-trivial conflicts (check the `To Be Backported` list), prefer if you could check and make a PR targeting the 4.2 branch if possible)
Philipp Oeser commented 2024-08-07 14:49:19 +02:00
Member
Copy Link

@pragma37 : can you make a PR targeting the 4.2 branch if possible regarding #124876 ?

@pragma37 : can you make a PR targeting the 4.2 branch if possible regarding #124876 ?
Philipp Oeser commented 2024-08-07 14:52:01 +02:00
Member
Copy Link

@mont29 @JulianEisel reg. blender/blender@a5970b8248 do we have consensus if this should go into LTS (check the To Be Backported list)

@mont29 @JulianEisel reg. blender/blender@a5970b8248 do we have consensus if this should go into LTS (check the `To Be Backported` list)
Philipp Oeser commented 2024-08-07 14:54:45 +02:00
Member
Copy Link

@Sergey reg. blender/blender@5ce29bedf6 , can you decide (dont feel confident enough myself to make that decision)

@Sergey reg. blender/blender@5ce29bedf6 , can you decide (dont feel confident enough myself to make that decision)
Philipp Oeser commented 2024-08-07 15:08:01 +02:00
Member
Copy Link

@Sean-Kim : can you make a PR targeting the 4.2 branch if possible regarding blender/blender@338140f1e6 ?

@Sean-Kim : can you make a PR targeting the 4.2 branch if possible regarding blender/blender@338140f1e6 ?
Philipp Oeser commented 2024-08-07 15:19:36 +02:00
Member
Copy Link

@dfelinto I assume

I used the ones I mentioned

> @dfelinto I assume > - by blender/blender@ba1028806aabc0ca33c3cddf4616d05f83e7289d [which is not in main] you mean blender/blender@7084465393c38ac533a6403f8f85fa3b8dc1334b ? > - by blender/blender@fc26da9e909bba60008d6ea620fe6270be3c089c [which is not in main] you mean blender/blender@7b8640896e1c36d5cf99a88dd5eedaa5d03df51b ? I used the ones I mentioned
Bastien Montagne commented 2024-08-07 16:32:32 +02:00
Owner
Copy Link

@mont29 @JulianEisel reg. blender/blender@a5970b8248 do we have consensus if this should go into LTS (check the To Be Backported list)

I would wait for 4.2.2 to backport this one. The changes are fairly large and complex, hard to rule out further issues with barely 2 weeks of existence in main.

> @mont29 @JulianEisel reg. blender/blender@a5970b8248 do we have consensus if this should go into LTS (check the `To Be Backported` list) I would wait for 4.2.2 to backport this one. The changes are fairly large and complex, hard to rule out further issues with barely 2 weeks of existence in `main`.
👍 1
Sergey Sharybin commented 2024-08-07 16:43:37 +02:00
Owner
Copy Link

@lichtwerk blender/blender@5ce29bedf6 looks fine. If we're still missing something, we'd correct it in one of the coming corrective releases. But overall I think it is a bugfix, and not a risky one.

EDIT: I've backported the commit.

@lichtwerk blender/blender@5ce29bedf6 looks fine. If we're still missing something, we'd correct it in one of the coming corrective releases. But overall I think it is a bugfix, and not a risky one. EDIT: I've backported the commit.
👍 1
Sean Kim commented 2024-08-07 18:23:58 +02:00
Member
Copy Link
* Applied the fix for #125621 in !126022 * Applied the fix for #125157 in !126050
👍 1
Christoph Lendenfeld commented 2024-08-08 15:38:36 +02:00
Member
Copy Link

@lichtwerk I made a combined PR for one of the issues: #126088: Fix: Wrong message in driver for disabled execution

The other commit (28dd78457a) I dropped from the backport list. Without the refactor preceding that, it is quite hard to backport and I am more worried about introducing bugs that fixing such a minor issue.

Edit: eating my hat on the last one. Can't drop since it's a regression from 4.1
Will look for a suitable fix

@lichtwerk I made a combined PR for one of the issues: [#126088: Fix: Wrong message in driver for disabled execution](https://projects.blender.org/blender/blender/pulls/126088) The other commit (28dd78457a) I dropped from the backport list. Without the refactor preceding that, it is quite hard to backport and I am more worried about introducing bugs that fixing such a minor issue. Edit: eating my hat on the last one. Can't drop since it's a regression from 4.1 Will look for a suitable fix
👍 1
Alaska commented 2024-08-15 04:08:18 +02:00
Member
Copy Link

@lichtwerk I have been working with the Cycles team to improve the Cycles render tests and we were wondering if you'd like some of these backported to 4.2 LTS to help catch unexpected changes during backporting?

Just for reference, the changes are only in the Blender repo, not the blender-tests-data repo. The commits simply enable test configurations that were previously missing.

Here are a list of commmits, what they do, and difficulites of backporting them.

  • blender/blender@ef010da315 - Enables MNEE tests on Apple GPUs (All other platforms already tested this)
  • blender/blender@935c49f1cf and blender/blender@35198ec363 - Rename blacklist to blocklist. No functional change, but it's required to avoid merge conflicts on a later commit.
  • blender/blender@389b322975 - Add buildbot configuration for all platforms - Required for us to enable the tests from the next commit on the build bot.
  • blender/blender@1330d0ddda - Enable running all Cycles tests with OSL. This is the main commit we were interested in backporting as basically none of Cycles was tested with OSL in the test suite prior to this commit.
    • Difficulty of backporting: Assuming all the commits prior to this one are backported, it should be simple to backport the code. The issue is that some render tests will fail. This is because we fixed some of failing OSL render tests in 4.3, but decided against backporting to 4.2 as they change the look of renders, which should be avoided when possible in a LTS release.
    • To deal with this, I can provide a .diff file to add the failing tests to the blocklist. Or I can create a 4.2 version of the commit with the failing tests already in the blocklist.
    • Alternatively we can skip backporting these changes. Sergey brought up that the number of backports will reduce with time, and the chance of them impacting OSL will drop. So there isn't a high priority to backporting this change.
@lichtwerk I have been working with the Cycles team to improve the Cycles render tests and we were wondering if you'd like some of these backported to 4.2 LTS to help catch unexpected changes during backporting? Just for reference, the changes are only in the Blender repo, not the `blender-tests-data` repo. The commits simply enable test configurations that were previously missing. Here are a list of commmits, what they do, and difficulites of backporting them. - blender/blender@ef010da315b596edde5aaf9d8d60101ca3a64373 - Enables MNEE tests on Apple GPUs (All other platforms already tested this) - blender/blender@935c49f1cf97628d45a24ecee8c64a2e1f397f3b and blender/blender@35198ec3633318cae4d203246ef044d7b6f1fee9 - Rename blacklist to blocklist. No functional change, but it's required to avoid merge conflicts on a later commit. - blender/blender@389b322975947d97106ec52634312e4afb474cfa - Add buildbot configuration for all platforms - Required for us to enable the tests from the next commit on the build bot. - blender/blender@1330d0dddac11043969f0d27a65573a8acab0756 - Enable running all Cycles tests with OSL. This is the main commit we were interested in backporting as basically none of Cycles was tested with OSL in the test suite prior to this commit. - Difficulty of backporting: Assuming all the commits prior to this one are backported, it should be simple to backport the code. The issue is that some render tests will fail. This is because we fixed some of failing OSL render tests in 4.3, but decided against backporting to 4.2 as they change the look of renders, which should be avoided when possible in a LTS release. - To deal with this, I can provide a .diff file to add the failing tests to the blocklist. Or I can create a 4.2 version of the commit with the failing tests already in the blocklist. - Alternatively we can skip backporting these changes. Sergey brought up that the number of backports will reduce with time, and the chance of them impacting OSL will drop. So there isn't a high priority to backporting this change.
Philipp Oeser commented 2024-08-16 09:43:56 +02:00
Member
Copy Link

@lichtwerk I have been working with the Cycles team to improve the Cycles render tests and we were wondering if you'd like some of these backported to 4.2 LTS to help catch unexpected changes during backporting?

Just for reference, the changes are only in the Blender repo, not the blender-tests-data repo. The commits simply enable test configurations that were previously missing.

Here are a list of commmits, what they do, and difficulites of backporting them.

  • blender/blender@ef010da315 - Enables MNEE tests on Apple GPUs (All other platforms already tested this)
  • blender/blender@935c49f1cf and blender/blender@35198ec363 - Rename blacklist to blocklist. No functional change, but it's required to avoid merge conflicts on a later commit.
  • blender/blender@389b322975 - Add buildbot configuration for all platforms - Required for us to enable the tests from the next commit on the build bot.
  • blender/blender@1330d0ddda - Enable running all Cycles tests with OSL. This is the main commit we were interested in backporting as basically none of Cycles was tested with OSL in the test suite prior to this commit.
    • Difficulty of backporting: Assuming all the commits prior to this one are backported, it should be simple to backport the code. The issue is that some render tests will fail. This is because we fixed some of failing OSL render tests in 4.3, but decided against backporting to 4.2 as they change the look of renders, which should be avoided when possible in a LTS release.
    • To deal with this, I can provide a .diff file to add the failing tests to the blocklist. Or I can create a 4.2 version of the commit with the failing tests already in the blocklist.
    • Alternatively we can skip backporting these changes. Sergey brought up that the number of backports will reduce with time, and the chance of them impacting OSL will drop. So there isn't a high priority to backporting this change.

@Alaska : these all seem fine to me (so feel free to add them to the backport list)
For the last one, it seems to make most sense to create a 4.2 PR (with the failing tests already in the blocklist), just mention the PR in the backport list)

> @lichtwerk I have been working with the Cycles team to improve the Cycles render tests and we were wondering if you'd like some of these backported to 4.2 LTS to help catch unexpected changes during backporting? > > Just for reference, the changes are only in the Blender repo, not the `blender-tests-data` repo. The commits simply enable test configurations that were previously missing. > > Here are a list of commmits, what they do, and difficulites of backporting them. > > - blender/blender@ef010da315b596edde5aaf9d8d60101ca3a64373 - Enables MNEE tests on Apple GPUs (All other platforms already tested this) > - blender/blender@935c49f1cf97628d45a24ecee8c64a2e1f397f3b and blender/blender@35198ec3633318cae4d203246ef044d7b6f1fee9 - Rename blacklist to blocklist. No functional change, but it's required to avoid merge conflicts on a later commit. > - blender/blender@389b322975947d97106ec52634312e4afb474cfa - Add buildbot configuration for all platforms - Required for us to enable the tests from the next commit on the build bot. > - blender/blender@1330d0dddac11043969f0d27a65573a8acab0756 - Enable running all Cycles tests with OSL. This is the main commit we were interested in backporting as basically none of Cycles was tested with OSL in the test suite prior to this commit. > - Difficulty of backporting: Assuming all the commits prior to this one are backported, it should be simple to backport the code. The issue is that some render tests will fail. This is because we fixed some of failing OSL render tests in 4.3, but decided against backporting to 4.2 as they change the look of renders, which should be avoided when possible in a LTS release. > - To deal with this, I can provide a .diff file to add the failing tests to the blocklist. Or I can create a 4.2 version of the commit with the failing tests already in the blocklist. > - Alternatively we can skip backporting these changes. Sergey brought up that the number of backports will reduce with time, and the chance of them impacting OSL will drop. So there isn't a high priority to backporting this change. @Alaska : these all seem fine to me (so feel free to add them to the backport list) For the last one, it seems to make most sense to create a 4.2 PR (with the failing tests already in the blocklist), just mention the PR in the backport list)
Philipp Oeser commented 2024-08-16 13:42:27 +02:00
Member
Copy Link

@Scurest @aras_p @HooglyBoogly @ideasman42 there were some backports that need further clarification (check the To Be Backported list)

@Scurest @aras_p @HooglyBoogly @ideasman42 there were some backports that need further clarification (check the `To Be Backported` list)
Campbell Barton commented 2024-08-16 13:48:09 +02:00
Owner
Copy Link

@lichtwerk updated the two issues (had outdated SHA1's for some reason).

@lichtwerk updated the two issues (had outdated SHA1's for some reason).
Hans Goudey commented 2024-08-16 14:39:04 +02:00
Member
Copy Link

Ah, my breaking commit actually wasn't in 4.2.

Ah, my breaking commit actually wasn't in 4.2.
Philipp Oeser commented 2024-08-16 15:39:44 +02:00
Member
Copy Link

Ah, my breaking commit actually wasn't in 4.2.

Inspecting (issue) editing history in gitea is just awefull... So you removed a commit fro the backport list?

> Ah, my breaking commit actually wasn't in 4.2. Inspecting (issue) editing history in gitea is just awefull... So you removed a commit fro the backport list?
Hans Goudey commented 2024-08-16 15:43:39 +02:00
Member
Copy Link

So you removed a commit fro the backport list?

Yeah, I removed a716685f2f.

>So you removed a commit fro the backport list? Yeah, I removed a716685f2f54f07910e1d47a6b38cdd0ec2edfbc.
👍 1
Alaska commented 2024-08-28 12:35:12 +02:00
Member
Copy Link

@lichtwerk and @ThomasDinges I was wondering if I could get your input on whether or not this commit should be included in 4.2 LTS and possibly 3.6 LTS.

Expand for details

The commit in question:

blender/blender@84bab7f300

What the commit does:

Fixes a bug that under certain circumstances Cycles light tree would skip certain lights during NEE, leading to artifacts (parts of lights missing), or increased noise in the impacted areas depending on the radius of the light and how close it is to the impacted surface. #126592 is an example of the artifacts case.

Reason it's not suitable for a LTS release:

In basically every scene that uses the light tree feature (which is most scenes as the feature is enabled by default), Cycles render noise will change. In some scenes, the noise may increase to a point where this change would be considered a regression in sampling quality (We have not found these scenes in our limited testing (Only 10 or so scenes), this is hypothetical at the moment).

Arguments for and against adding it to LTS:

Against:

  • The noise issue listed above.
  • Along with that, the issue seems uncommon under normal circumstances as the issue has been around since the Light tree was added (Blender 3.5?) and nobody has reported it until now #126625 (comment) . So there doesn't appear to be urgency to get this fixed as very few people have encountered it.

For:

  • Having issues such as "part of your light isn't rendered correctly" is bad for a default feature.
  • Sergey suggests only backporting this change if there is a request for it. #126625 (comment)
    • There is currently one request (me). Mainly because I encountered this issue in a production scene I was working on (and the scene had to be put on hold until we'd discovered and fixed the issue), and I prefer to work on stable builds of Blender for anything production. However I'm just an individual and I'm free to change my Blender version to fit my needs. So there's a preference from me to have this change in a stable build, but it's not a necessity for what I do.

I will note that there are work arounds an artist can employ to avoid this issue.

@lichtwerk and @ThomasDinges I was wondering if I could get your input on whether or not this commit should be included in 4.2 LTS and possibly 3.6 LTS. <details> <summary>Expand for details</summary> ### The commit in question: blender/blender@84bab7f300b6f4e4f6d02540c1119a146b83c033 ### What the commit does: Fixes a bug that under certain circumstances Cycles light tree would skip certain lights during NEE, leading to artifacts (parts of lights missing), or increased noise in the impacted areas depending on the radius of the light and how close it is to the impacted surface. #126592 is an example of the artifacts case. ### Reason it's not suitable for a LTS release: In basically every scene that uses the light tree feature (which is most scenes as the feature is enabled by default), Cycles render noise will change. In some scenes, the noise may increase to a point where this change would be considered a regression in sampling quality (We have not found these scenes in our limited testing (Only 10 or so scenes), this is hypothetical at the moment). ### Arguments for and against adding it to LTS: #### Against: - The noise issue listed above. - Along with that, the issue seems uncommon under normal circumstances as the issue has been around since the Light tree was added (Blender 3.5?) and nobody has reported it until now https://projects.blender.org/blender/blender/pulls/126625#issuecomment-1277101 . So there doesn't appear to be urgency to get this fixed as very few people have encountered it. #### For: - Having issues such as "part of your light isn't rendered correctly" is bad for a default feature. - Sergey suggests only backporting this change if there is a request for it. https://projects.blender.org/blender/blender/pulls/126625#issuecomment-1279371 - There is currently one request ([me](https://projects.blender.org/blender/blender/pulls/126625#issuecomment-1280292)). Mainly because I encountered this issue in a production scene I was working on (and the scene had to be put on hold until we'd discovered and fixed the issue), and I prefer to work on stable builds of Blender for anything production. However I'm just an individual and I'm free to change my Blender version to fit my needs. So there's a preference from me to have this change in a stable build, but it's not a necessity for what I do. I will note that there are work arounds an artist can employ to avoid this issue. </details>
Philipp Oeser commented 2024-08-28 13:03:42 +02:00
Member
Copy Link

Thx explaining that in detail @Alaska . I think in this case (since the pros and cons seem equally relevant to me), it is really up to the module to decide here. What would be the "worst-case" scenario here? A studio having to re-render a bunch of shots? That is of course bad for LTS, but the upside of having a relevant bug fixed equals this out (at least to me). So no objections from my side to include it, final call would have to be made by @Sergey @LukasStockner @weizhen I think

Thx explaining that in detail @Alaska . I think in this case (since the pros and cons seem equally relevant to me), it is really up to the module to decide here. What would be the "worst-case" scenario here? A studio having to re-render a bunch of shots? That is of course bad for LTS, but the upside of having a relevant bug fixed equals this out (at least to me). So no objections from my side to include it, final call would have to be made by @Sergey @LukasStockner @weizhen I think
👍 1
Sergey Sharybin commented 2024-08-28 14:21:01 +02:00
Owner
Copy Link

Changes in noise pattern is okay to accept. If there is some bigger impact on the quality, we'd need to fix it anyway, and can port it to LTS as well.

TO me it seems fine to port the fix form Alaska. As was mentioned it i probably not something people run into, more importantly, there are people in the community who will benefit from the port.

Changes in noise pattern is okay to accept. If there is some bigger impact on the quality, we'd need to fix it anyway, and can port it to LTS as well. TO me it seems fine to port the fix form Alaska. As was mentioned it i probably not something people run into, more importantly, there are people in the community who will benefit from the port.
Philipp Oeser commented 2024-09-12 14:42:12 +02:00
Member
Copy Link

@ideasman42 / @mont29 : some questions on the backports marked in the To Be Backported list, mind checking?

@ideasman42 / @mont29 : some questions on the backports marked in the `To Be Backported` list, mind checking?
Campbell Barton commented 2024-09-13 07:57:30 +02:00
Owner
Copy Link

@lichtwerk submitted a PR's for commits that conflicted.

@lichtwerk submitted a PR's for commits that conflicted.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset System
Asset datablocks, libraries, browser and shelf

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
Backward and forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
Interest
Freestyle

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
ID Management

  
Interest
Images & Movies

  
Interest
Import Export

  
Interest
Line Art

  
Interest
Masking

  
Interest
Metal

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Motion Tracking

  
Interest
Nodes & Physics

  
Interest
OpenGL

  
Interest
Overlay

  
Interest
Overrides

  
Interest
Performance

  
Interest
Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds & Tests

  
Interest
Python API

  
Interest
Render & Cycles

  
Interest
Render Pipeline

  
Interest
Sculpt, Paint & Texture

  
Interest
Text Editor

  
Interest
Translations

  
Interest
Triaging

  
Interest
Undo

  
Interest
USD

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Interest
Video Sequencer

  
Interest
Viewport & EEVEE

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Wayland windowing on Unix

  
Interest
Workbench

  
Interest: X11

Xorg/X11 windowing

  
Legacy
Asset Browser Project

Archived

  
Legacy
Blender 2.8 Project

Archived

  
Legacy
Milestone 1: Basic, Local Asset Browser

Archived

  
Legacy
OpenGL Error

Archived

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Related to security, https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
Module
Grease Pencil

  
Module
Modeling

  
Module
Nodes & Physics

  
Module
Pipeline, Assets & IO

  
Module
Platforms, Builds & Tests

  
Module
Python API

  
Module
Render & Cycles

  
Module
Sculpt, Paint & Texture

  
Module
Triaging

  
Module
User Interface

  
Module
VFX & Video

  
Module
Viewport & EEVEE

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Severity
High

  
Severity
Low

  
Severity
Normal

  
Severity
Unbreak Now!

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Info from Developers

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Design

  
Type
Known Issue

  
Type
Patch

Archived

  
Type
Report

Archived

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Clear milestone
No items
No Milestone
4.2 LTS
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
Philipp Oeser
9 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#124452
No description provided.
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?