Merge remote-tracking branch 'origin/master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Fri, 20 Apr 2018 13:05:22 +0000 (15:05 +0200)
committerGaia Clary <gaia.clary@machinimatrix.org>
Fri, 20 Apr 2018 13:05:22 +0000 (15:05 +0200)
1  2 
source/blender/collada/AnimationImporter.cpp
source/blender/editors/animation/keyframing.c
source/blender/makesdna/DNA_curve_types.h