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)
commitf91e9529dacb21ef709e7fd1ef8f989731a5a2f3
tree4156f2a01563a526a116297966cda041afa98643
parent3b0475bc6407d37329b729f6125edbac23404dd7
parentd83681807e1ef39228620d10fee22003d753a050
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/idprop.c
source/blender/python/intern/bpy_rna.c