Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 19 May 2017 07:36:14 +0000 (09:36 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 19 May 2017 07:36:14 +0000 (09:36 +0200)
commit1f46da922a98c6badf6e2de13304358b3b0b7576
treeb4e6a47524627ad6f7a925876eecbccf9cf542b6
parentf95828a0182acb7c1ba0fa8afccd6acdf23bc5c2
parent4a04d7ae8930502037cd23dc94ed1bc9bc0043ac
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
build_files/build_environment/install_deps.sh
intern/cycles/device/device_cuda.cpp
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/mask/mask_draw.c
source/blender/editors/space_image/image_ops.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/envmap.c