Bastien Montagne e44743736f Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/io/io_collada.c
	source/blender/editors/object/object_bake.c
	source/blender/editors/object/object_edit.c
	source/blender/editors/render/render_internal.c
	source/blender/makesrna/intern/rna_object_api.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-06-01 17:26:36 +02:00

..

build_environment

Merge remote-tracking branch 'origin/master' into blender2.8

2018-05-28 14:35:59 -06:00

buildbot

Merge branch 'master' into blender2.8

2018-04-25 13:35:38 +02:00

cmake

Merge branch 'master' into blender2.8

2018-06-01 17:26:36 +02:00

package_spec

Call to python3 for stand-alone scripts

2016-07-26 05:18:00 +10:00

utils

Update tgz script, remove deprecated GZIP use

2017-09-12 16:25:19 +10:00

windows

Add Asan support for clang on windows.

2018-05-31 11:50:30 -06:00