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

..

readblenentry.c

Cleanup: hide debug print behind proper debug defines instead of using comments...

2016-06-21 16:19:08 +02:00

readfile.c

Merge branch 'master' into blender2.8

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

readfile.h

Cleanup: use const, move comments to enum

2016-07-21 11:52:41 +10: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

Merge branch 'master' into blender2.8

2016-07-12 00:07:44 +02:00

versioning_260.c

Removed point cache blenkernel code.

2016-04-29 15:03:58 +02:00

versioning_270.c

Merge branch 'master' into blender2.8

2016-09-26 17:19:03 +02:00

versioning_defaults.c

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

versioning_legacy.c

Removed point cache blenkernel code.

2016-04-29 15:03:58 +02:00

writefile.c

Fix T49460: Particle group instance 'Use Count' value gets reset on file-load.

2016-09-28 15:08:45 +02:00