This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

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

..

readblenentry.c

Load user-preferences before startup file

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

readfile.c

Fix possible heap use-after-free in workspace lib-linking

2017-06-14 00:09:37 +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: add braces for multi-line blocks

2017-05-19 22:18:54 +10:00

versioning_270.c

Merge branch 'master' into blender2.8

2017-05-25 00:43:01 +02:00

versioning_280.c

Woarkspace: Remove residue of hidden type

2017-06-13 12:02:08 +02:00

versioning_defaults.c

Merge branch 'master' into blender2.8

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

versioning_legacy.c

TexFace removal part 2

2017-05-25 01:40:15 +10:00

writefile.c

Rename probe to light-probe

2017-06-12 21:34:55 +10:00