Merge remote-tracking branch 'origin' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Sun, 11 Mar 2018 22:45:53 +0000 (23:45 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Sun, 11 Mar 2018 22:45:53 +0000 (23:45 +0100)
commitddae05cdca9211a789a6501c6ca054f9a46e07c5
treee7591dd7c31ccfb6c25beb0bca7bf670a788cd35
parent7ecc7c46af493f984e9cb2f08ac75da5b30ffd35
parent2c9c22df26dfdcf03bb308fdf35294ed79c2d0e5
Merge remote-tracking branch 'origin' into blender2.8
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationImporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/ImageExporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/windowmanager/intern/wm_window.c
source/creator/creator_args.c