Antonio Vazquez 33f9fe3c62 Merge branch 'blender-v2.83-release' ...

Conflicts:
	release/scripts/startup/bl_ui/properties_render.py
	source/blender/blenkernel/BKE_blender_version.h

2020-05-12 17:54:20 +02:00

..

addons @ 136030c956

Reset submodule to the right place in master

2020-04-22 20:20:48 +02:00

addons_contrib @ 9468c406fb

Ensure master points at latest submodule heads

2020-04-15 14:41:47 +03:00

freestyle

Fix T72289: FreeStyle python error

2019-12-18 11:00:50 +01:00

modules

Various fixes, cleanup and improvements to i18n module.

2020-05-05 18:08:40 +02:00

presets

Annotations: Add Stabilization for draw tool

2020-05-11 12:39:23 +02:00

startup

Merge branch 'blender-v2.83-release'

2020-05-12 17:54:20 +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