Block a user
5ed3c314ca
Merge remote-tracking branch 'upstream/main' into join-triangles-stateful
52136d3afa
Merge branch 'blender-v4.3-release'
49ab0bb844
Fix: Edge Slide: Vertex destination not matching edges intersection
0a4877264d
Cycles: Cleanup: Move SVM execution state into a helper struct
580e0af309
Fix #128702: Edge Slide can cause Blender to freeze
Modeling: add support for merging triangles with reference to topology
I forgot to mention, this requires testing aginst https://projects.blender.org/jcwenger/blender-test-data/src/branch/triangle_merge rather than main.
c8390519c8
Use macro
d1cc935cfa
Be less paranoid.
e945a08d62
Initiaize vars and switch assert
f2a6f10571
Fix indent
437494d10b
Improve comments
2787562217
Fix factor
32a1edbd43
Merge remote-tracking branch 'upstream/main' into join-triangles-stateful
ed1c708619
Merge branch 'blender-v4.3-release'
e82ce39e17
Fix: Snap Toggle not updating snap status after a transform operation
5eae28e685
Fix: Snap Toggle not updating snap status after a transform operation
Modeling: add support for merging triangles with reference to topology
4b37912990 -- but untested. Getting unrelated exceptions due to gpu shaders changes in main that prevent running blender. Will chase down later today.
c1dbd71d76
Restore const_cast
0ad65e05a1
fix a warn about unused
4b37912990
Convert topology influence to a factor