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

Conflicts:
	source/blender/blenkernel/BKE_global.h
	source/blender/editors/undo/ed_undo.c

2018-10-17 16:50:36 +02:00

..

CMakeLists.txt

DEBUG_IO: add sanity check on libdata in undo step as well.

2018-10-17 16:43:02 +02:00

ed_undo.c

Merge branch 'master' into blender2.8

2018-10-17 16:50:36 +02:00

memfile_undo.c

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

undo_intern.h

Cleanup: trailing whitespace (comment blocks)

2018-06-01 18:19:39 +02:00

undo_system_types.c

Cleanup: style, doxy headers

2018-04-06 10:47:39 +02:00