Bastien Montagne 4e5f9bbd34 Merge branch 'blender-v3.3-release' ...

Conflicts:
	source/blender/editors/space_outliner/outliner_tools.cc

2022-08-12 15:17:12 +02:00

..

addons @ 7a8502871c

Sculpt: Fix scene spacing mode (phase 1)

2022-07-16 16:45:41 -07:00

addons_contrib @ 95107484d0

Cleanup: Move sculpt_automasking.c to c++

2022-06-08 03:33:18 -07:00

freestyle

Cleanup: unused argument, variable warnings

2022-06-14 14:30:09 +10:00

modules

Cleanup: group translation imports

2022-08-12 12:07:52 +10:00

presets

Fix T96885: Drag Fallback on Tweak is using Move instead

2022-08-12 14:24:31 +10:00

startup

Merge branch 'blender-v3.3-release'

2022-08-12 15:17:12 +02:00

templates_osl

OSL: add basic OSL shader template

2021-03-26 10:27:31 -06:00

templates_py

Fix T94857: 'Gizmo Operator' from python templates spins when dragged

2022-05-26 15:53:17 +10:00