Sybren A. Stüvel d4913af846 Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/blenloader/intern/writefile.c

2017-02-08 13:10:16 +01:00

..

addons @ 371960484a

Fix blurry icons

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

addons_contrib @ a8515cfdfe

Fix blurry icons

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

freestyle

Fix T48366: Freestyle will unnecessary exclude some linked objects.

2016-08-05 22:25:16 +09:00

modules

Render Layers and Collections (merge from render-layers)

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

presets

Render Layers and Collections (merge from render-layers)

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

startup

Merge branch 'master' into blender2.8

2017-02-08 13:10:16 +01: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