Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 11 Nov 2018 05:35:44 +0000 (16:35 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 11 Nov 2018 05:35:44 +0000 (16:35 +1100)
1  2 
source/blender/makesrna/intern/rna_define.c
source/blender/python/intern/bpy_interface.c