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

Conflicts:
	source/blender/blenkernel/BKE_material.h
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/render/render_preview.c
	source/blender/makesrna/intern/rna_object.c

2018-05-29 16:02:53 +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 remote-tracking branch 'origin/master' into blender2.8

2018-05-28 20:07:51 -06: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

make.bat : fix release build not getting the right settings.

2018-05-28 21:50:59 -06:00