Bastien Montagne 936d1cef6e Merge branch 'blender2.8' into soc-2018-bevel ...

Conflicts:
	release/scripts/addons
	release/scripts/startup/bl_ui/space_view3d_toolbar.py
	source/blender/editors/space_outliner/outliner_draw.c

2018-08-01 14:16:41 +02:00

..

engines

Merge branch 'master' into blender2.8

2018-08-01 08:42:00 +10:00

intern

Merge branch 'blender2.8' into soc-2018-bevel

2018-08-01 14:16:41 +02:00

modes

…

CMakeLists.txt

…

DRW_engine.h

…