Merge branch 'master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Mon, 26 Feb 2018 22:38:21 +0000 (23:38 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Mon, 26 Feb 2018 22:38:21 +0000 (23:38 +0100)
commite24906759f7b181efc568c3ddb9afffa8dfe965c
tree767e05a52ed601b2806180724e6ff4cfee57f63b
parentedcd30f6ab238435418728833a1f1befbc4facbc
parentb5f0e8e1a1c04db001a34090e288531717e0980b
Merge branch 'master' into blender2.8
source/blender/collada/AnimationExporter.cpp