Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2018 17:52:20 +0000 (19:52 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2018 17:52:20 +0000 (19:52 +0200)
1  2 
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_nla.c