Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 4 May 2018 13:21:42 +0000 (15:21 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 4 May 2018 13:21:42 +0000 (15:21 +0200)
1  2 
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/intern/action.c