Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 03:21:03 +0000 (14:21 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 03:21:03 +0000 (14:21 +1100)
1  2 
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_ui_api.c

Simple merge