Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 06:31:19 +0000 (08:31 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 06:31:19 +0000 (08:31 +0200)
commit55354d734e98e8c733401f094b3d90d0b8ae3474
treeeca7da78baf485962814a60ec88061ac94c374eb
parentd28d202fd113810ad05b572b785b106fcfb00992
parent1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f
Merge branch 'master' into blender2.8
build_files/buildbot/slave_compile.py
source/blender/python/intern/bpy_rna.c