Bastien Montagne 8f670dd855 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_material.h
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/render/render_preview.c
	source/blender/makesrna/intern/rna_object.c

2018-05-29 16:02:53 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-05-29 16:02:53 +02:00

creator

Cleanup: move toolsystem into own include

2018-05-23 08:23:16 +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