Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 22:43:58 +0000 (08:43 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 22:49:34 +0000 (08:49 +1000)
commit1ee11b50854c6907fc9a60686db93ca3aa0a6342
tree0454802e8275ef5798a85004059b7e6449c8a62c
parent361acb69916372a1388cafe57337194cbbe8c3e8
parentfb1cd7648f912123558dbe26387639556900a78c
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_anim_api.h
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_screen_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_types.h