Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Feb 2018 10:16:43 +0000 (11:16 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Feb 2018 10:16:43 +0000 (11:16 +0100)
1  2 
source/blender/collada/AnimationExporter.cpp
source/blender/collada/collada_utils.h