Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 06:10:45 +0000 (16:10 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 06:10:45 +0000 (16:10 +1000)
12 files changed:
1  2 
source/blender/blenkernel/intern/node.c
source/blender/blenlib/BLI_ghash.h
source/blender/editors/interface/interface_handlers.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_define.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_nodetree.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c

Simple merge
Simple merge
Simple merge