Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 31 Aug 2017 16:30:48 +0000 (02:30 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 31 Aug 2017 16:30:48 +0000 (02:30 +1000)
14 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_armature.py
release/scripts/startup/bl_ui/space_image.py
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_internal_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c
source/blender/python/intern/bpy_rna.c

Simple merge
Simple merge