Merge remote-tracking branch 'origin/master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 4 Dec 2018 19:31:30 +0000 (20:31 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 4 Dec 2018 19:31:30 +0000 (20:31 +0100)
commitbaf89af0f5fedf0d693a9a74e690b3ca7d8ff292
tree22992b7f2d519c31dfa644cac58bd6cf6a5945c9
parent5c3955452b0e93c3977afbb3294a19d8b20d8aea
parent22bba02bc8109f392fce50a24a4825390bca1bda
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/collada/DocumentImporter.cpp
source/blender/collada/DocumentImporter.h