Kévin Dietrich 94eb189752 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_blender_version.h

2018-02-24 14:02:50 +01:00

..

addons @ 371960484a

Merge branch 'master' into blender2.8

2018-02-03 16:10:01 +01:00

addons_contrib @ a8515cfdfe

Merge branch 'master' into blender2.8

2018-02-03 16:10:01 +01:00

freestyle

Rename any instance of scene layer or render layer in code with view layer

2017-11-23 07:48:23 -02:00

modules

Object Mode: move to workspace struct

2018-02-08 21:14:26 +11:00

presets

Rename any instance of scene layer or render layer in code with view layer

2017-11-23 07:48:23 -02:00

startup

Merge branch 'master' into blender2.8

2018-02-24 14:02:50 +01:00

templates_osl

Cycles: Remove Westin closure.

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

templates_py

Fix color for manipulator drawing

2018-01-10 20:50:14 +11:00