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

Conflicts:
	source/blender/collada/MeshImporter.cpp
	source/blender/editors/object/object_add.c
	source/blender/editors/screen/screen_edit.c

2017-06-15 15:54:11 +02:00

..

intern

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

BLO_blend_defs.h

Make .blend file thumbnail reading simpler and more coherent, read/store them when reading in background mode.

2015-08-27 16:00:46 +02:00

BLO_readfile.h

Main Workspace Integration

2017-06-01 19:59:37 +02:00

BLO_runtime.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

BLO_undofile.h

Cleanup: use BLO_memfile prefix

2015-04-18 18:11:01 +02:00

BLO_writefile.h

Cleanup: take Main argument for copy

2016-03-03 13:35:21 +11:00

CMakeLists.txt

Depsgraph: Remove old depsgraph header from blenloader

2017-04-06 16:13:57 +02:00