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

Conflicts:
	source/blender/editors/sculpt_paint/paint_image.c
	source/blender/editors/space_image/image_edit.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_material.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blender/makesrna/intern/rna_space.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-05-31 18:35:14 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-05-31 18:35:14 +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