Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 17 Feb 2018 00:39:29 +0000 (01:39 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 17 Feb 2018 00:39:29 +0000 (01:39 +0100)
commitf2453ecdcd179fb696494d03501c0dd149ee1ed2
tree23fdd70d99c95b5efab3fb258db77b68501aa059
parent09eb790f4bbc89ceac0dda949f2f42a3c94883a4
parent5bc2c17161cfc23ca2d8c58e7e24458c277100ae
Merge branch 'master' into blender2.8
CMakeLists.txt
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationImporter.cpp
source/blender/collada/collada_utils.cpp
source/blender/collada/collada_utils.h
tests/python/CMakeLists.txt