Merge branch 'master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 4 Dec 2018 18:48:21 +0000 (19:48 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 4 Dec 2018 18:48:21 +0000 (19:48 +0100)
commit5c3955452b0e93c3977afbb3294a19d8b20d8aea
tree927754d803dc1f60b80f73cdab8c63d15b6f7c2e
parent34b73cb11ce50f2afefabec32aadb9a853eec177
parent10c50d7dbf7578b35b3bf19a1948f556f9eb203b
Merge branch 'master' into blender2.8
intern/ghost/intern/GHOST_ContextCGL.mm
source/blender/collada/CMakeLists.txt
source/blender/collada/DocumentImporter.cpp
source/blender/collada/DocumentImporter.h