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)
1  2 
build_files/buildbot/slave_compile.py
source/blender/python/intern/bpy_rna.c

Simple merge