Julian Eisel a5cba9aab9 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_nla/nla_draw.c
	source/blender/editors/space_view3d/view3d_draw.c

2017-03-06 13:00:46 +01:00

..

addons @ f2bb66b68b

Point addons to 2.8 branch

2017-02-20 10:14:25 +01:00

addons_contrib @ a8515cfdfe

Fix blurry icons

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

freestyle

Cleanup: Grey --> Gray

2017-02-27 19:33:57 -05:00

modules

Merge branch 'master' into blender2.8

2017-02-27 16:08:25 -03:00

presets

Merge branch 'master' into blender2.8

2017-03-02 19:15:32 +01:00

startup

Merge branch 'master' into blender2.8

2017-03-06 13:00:46 +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