Bastien Montagne 44f91a9a18 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

2017-05-22 22:49:02 +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

Cleanup: triple quotes for docstrings

2017-04-14 20:01:43 +10:00

modules

Fix crash when adding Torus in edit mode

2017-05-19 15:33:50 +02:00

presets

Merge branch 'master' into blender2.8

2017-05-11 22:07:00 +10:00

startup

Merge branch 'master' into blender2.8

2017-05-22 22:49:02 +02:00

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00