Bastien Montagne 9b4e56c091 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_camera.h
	source/blender/blenkernel/BKE_dynamicpaint.h
	source/blender/blenkernel/BKE_object.h
	source/blender/blenkernel/intern/camera.c
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/smoke.c
	source/blender/editors/object/object_transform.c
	source/blender/editors/physics/dynamicpaint_ops.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-05-31 12:57:24 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-05-31 12:57:24 +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