Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 16 Jul 2018 12:36:59 +0000 (14:36 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 16 Jul 2018 12:36:59 +0000 (14:36 +0200)
commitde2f1c64fe4b353899d99d85d6e9aee16ce17688
tree7e90ac4ca2aac5ffb34759f61112ed5c6d7cf63e
parente1423391621dcc72e55144541cb26b540698edba
parent80795ff8976fabb210ef139f94d60a9e1080c8ce
Merge branch 'master' into blender2.8
build_files/buildbot/slave_compile.py
intern/cycles/render/image.cpp
source/blender/windowmanager/intern/wm_playanim.c