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)
commit792eab8190f538d15ea2086a641383e2c3b3d03e
treec0b480a27a61ae2a4c4fefc8351a433526364a88
parent50579da91a380bac1ca0fa67df62520ee7b47aa5
parentff839fb6c1c4b45786f9bbcb302d0af4d03c004a
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/collada/AnimationImporter.cpp
source/blender/editors/animation/keyframing.c
source/blender/makesdna/DNA_curve_types.h