Bastien Montagne 4bf751be70 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/modifiers/intern/MOD_normal_edit.c
	source/blender/windowmanager/intern/wm_files.c

2018-06-14 12:39:52 +02:00

..

addons @ 8f2fd7e23f

Move call to drw_state_ensure_not_reused() inside the region locked by DST.gl_context_mutex.

2018-06-14 12:03:40 +02:00

addons_contrib @ 34a27a42d7

Move call to drw_state_ensure_not_reused() inside the region locked by DST.gl_context_mutex.

2018-06-14 12:03:40 +02:00

freestyle

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

modules

UI: preset popover buttons in panel headers.

2018-06-13 15:22:34 +02:00

presets

Update Flatty themes with the new pulldown background and minor tweaks.

2018-06-01 15:32:46 +02:00

startup

Merge branch 'master' into blender2.8

2018-06-14 12:39:52 +02:00

templates_osl

Cycles: Remove Westin closure.

2014-10-03 16:03:49 +02:00

templates_py

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00