Bastien Montagne 2113dbb013 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_outliner/outliner_select.c

2017-06-29 10:11:17 +02:00

..

addons @ 371960484a

Layers: move SceneCollection

2017-03-08 23:35:54 +01:00

addons_contrib @ a8515cfdfe

Fix blurry icons

2017-01-29 17:21:57 +03:00

freestyle

PYAPI: Fix freestyle submodules without tocrees

2017-06-14 14:42:44 -04:00

modules

Merge branch 'master' into blender2.8

2017-06-29 10:11:17 +02:00

presets

collada: change image export: export either UV Textures or Materials. This

2017-06-24 22:16:47 +02:00

startup

Merge branch 'master' into blender2.8

2017-06-26 13:27:54 +10:00

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Manipulator: Python API

2017-06-26 16:38:04 +10:00