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)
commit58a4c767a14b60b903fbe5c5e7e960c57212faeb
tree8483aebad87ecc50cdeb8f76e861c755efb2cbd7
parent9cfb72ff81a36c26f4b611ec733432968f15a2de
parentb8d77c44f112cae1e98308ff33ce055ea4fb46ff
Merge branch 'master' into blender2.8
12 files changed:
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