Bastien Montagne 6371f8ff8a Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/space_view3d/view3d_draw.c

2016-10-10 12:41:32 +02:00

..

intern

Merge branch 'master' into blender2.8

2016-10-10 12:41:32 +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

ID-Remap, step two: add some user-level tools.

2016-06-22 18:05:55 +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

Basic Alembic support

2016-08-06 10:58:13 +02:00