Bastien Montagne 1f46da922a Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/depsgraph_tag.cc
	source/blender/editors/mask/mask_draw.c

2017-05-19 09:36:14 +02:00

..

readblenentry.c

Load user-preferences before startup file

2017-03-16 04:02:24 +11:00

readfile.c

Fix info header stats to iterator over layer instead of scene

2017-05-16 12:50:23 +02:00

readfile.h

Merge branch 'master' into blender2.8

2017-03-16 04:53:07 +11:00

runtime.c

Cleanup: unused headers

2014-11-28 22:16:14 +01:00

undofile.c

Undo: use system memcmp

2016-07-08 15:54:34 +10:00

versioning_250.c

Remove use_display_lists option

2017-05-19 10:07:02 +10:00

versioning_260.c

Cleanup/refactor: Add new BLI_string_util.

2017-01-16 20:36:23 +01:00

versioning_270.c

Merge branch 'master' into blender2.8

2017-05-19 09:36:14 +02:00

versioning_280.c

Eevee: Add Rotation and ratio parameters to DoF.

2017-05-12 16:31:12 +02:00

versioning_defaults.c

Startup.blend: set EEVEE as the default engine

2017-05-12 13:54:48 +02:00

versioning_legacy.c

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

writefile.c

Merge branch 'master' into blender2.8

2017-05-15 15:51:54 +10:00