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)
commit1c4b04f1fde15a3be86a650b54f6e23030a97973
tree26e7d27e411b261d9d6ee26e302dce5967961fec
parent4165a57a66724b9b0f7e696a9d0ef75ee29a6af8
parent0e68751b8a0bac59a275b1fe3d818b8259d1cc7f
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_nla.c