Bastien Montagne 5f621a12c6 Merge branch 'blender-v2.90-release' ... Conflicts: source/blender/editors/gpencil/gpencil_primitive.c		2020-08-04 13:36:58 +02:00
..
addons@49c39f59fb	Audaspace: port documentation bugfix from upstream.	2020-08-03 14:21:54 +02:00
addons_contrib@a52733b58d	Audaspace: port documentation bugfix from upstream.	2020-08-03 14:21:54 +02:00
freestyle	Fix T72289: FreeStyle python error	2019-12-18 11:00:50 +01:00
modules	Cleanup: typos & co in UI messages (and some other places).	2020-08-04 13:26:58 +02:00
presets	Bevel: Refactor "Vertex Only" to an enum	2020-07-21 16:32:00 -04:00
startup	Fix missing shortcut indicators and crash on shortcut change	2020-08-03 18:26:06 +02:00
templates_osl	OSL: remove fresnel template that was not public domain.	2019-01-28 12:04:54 +01:00
templates_py	Addons: deprecate 'wiki_url'	2020-03-05 11:45:22 +11:00