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)
commit554fb0e7e0d815053defa0b0ba63869b13cf48a4
treed620beede110681297bfa624292196e1591f0c14
parent844a17a3d9d2ec06912f505e8a1282f278a7ea8d
parentaa0380a6a53033a23b589cbb21708855b8523f49
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/intern/action.c