Bastien Montagne 5a82aee9e6 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
	source/blender/blenkernel/BKE_mball.h
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/mball.c
	source/blender/editors/object/object_add.c
	source/blender/render/intern/source/convertblender.c

2018-05-31 16:57:39 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-05-31 16:57:39 +02:00

creator

Merge branch 'master' into blender2.8

2018-05-31 16:21:47 +02:00

tools @ 6bcd05cf6a

UI: tweaks to icon defaults

2018-05-11 22:15:05 +02:00

CMakeLists.txt

Removing Blender Game Engine from Blender 2.8

2018-04-17 17:51:28 +02:00