Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 30 Aug 2018 11:59:34 +0000 (13:59 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 30 Aug 2018 11:59:34 +0000 (13:59 +0200)
commitcaa7f749ed6e9b490d4b0d23c21c0c1d7c12447c
tree888742a0ec2177580f3fc8bf69627501e00cfeba
parent9b937c8404e10dab59c394bb9c838d4e8c5bf65b
parent8c3d2e549cff4d9c369c68936e0fce6b7ddc495f
Merge branch 'master' into blender2.8
build_files/buildbot/config/blender_linux.cmake
source/blender/makesrna/intern/rna_image_api.c