Merged master@e12c3110024dc4b62ffefa739288218b04e39f71 into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 18 Apr 2017 12:18:06 +0000 (14:18 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 18 Apr 2017 12:18:06 +0000 (14:18 +0200)
commitb27a98df1d9b8fb0210277d521d11d54d3b83d3a
tree9a12b2bd803d8b7aec4c4e40d6856b90fedbf467
parenta229ca8f4826c6aa1867c0abf283fa9e46e32368
parente12c3110024dc4b62ffefa739288218b04e39f71
Merged master@e12c3110024dc4b62ffefa739288218b04e39f71 into blender2.8

This doesn't merge entire master into blender2.8, but at least solves
one conflict.
tests/python/CMakeLists.txt