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

Conflicts:
	source/blender/editors/sculpt_paint/paint_image_proj.c

2018-06-19 10:52:01 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-06-19 10:52:01 +02:00

creator

Merge branch 'master' into blender2.8

2018-06-17 17:10:19 +02:00

tools @ 87f7038ee8

Cleanup: trailing space for remaining source/

2018-06-17 17:06:28 +02:00

CMakeLists.txt

Removing Blender Game Engine from Blender 2.8

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