Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 5 May 2018 07:57:45 +0000 (09:57 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 5 May 2018 07:57:45 +0000 (09:57 +0200)
1  2 
source/blender/blenkernel/intern/idprop.c
source/blender/python/intern/bpy_rna.c