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)
commitd81d77d17c13b63a045b434f235f6a802a466955
treef0cf5d2499ae87b0284367feb669e271ecd639d6
parenta48bc15707805d31826afa8fbd74942f8d14e9f4
parent89c2ff31d93582bd67a359dd0da56061ce7581cb
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_define.c
source/blender/python/intern/bpy_interface.c