Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 17 Aug 2018 11:00:52 +0000 (13:00 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 17 Aug 2018 11:00:52 +0000 (13:00 +0200)
commit7d720cc655b43af7c871a3715eb9fd5d3ffd753a
treef9e50a5f7217ea4f27f67b12ae785b082d7a14d9
parent9f0f8aabe2ca751386390ecb4121a3ae04107676
parentd33456e5ec70255a21089aa4c3dd7dc48307a344
Merge branch 'master' into blender2.8
build_files/cmake/platform/platform_unix.cmake
source/blender/makesrna/intern/rna_render.c