Bastien Montagne 722451e146 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/writefile.c

2017-03-17 11:00:41 +01:00

..

intern

Merge branch 'master' into blender2.8

2017-03-17 11:00:41 +01: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

Add BKE_blendfile_userdef_read_from_memory

2017-03-17 07:01:48 +11: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

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00