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)
1  2 
build_files/buildbot/slave_compile.py
intern/cycles/render/image.cpp
source/blender/windowmanager/intern/wm_playanim.c

Simple merge
Simple merge