Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 7 Dec 2017 17:00:03 +0000 (15:00 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 7 Dec 2017 17:00:03 +0000 (15:00 -0200)
commitdc848e9a8b6486ea83461c67c068a9ae8ac154ae
tree2cd74e4b46f24370a900bcbfbdfa0acc30d9e3cc
parent1c0905be0f6c36524adeb43237d9541bb1e6dc1e
parent237df2f86053e796da98c903185ec3d70ae13910
Merge remote-tracking branch 'origin/master' into blender2.8
release/scripts/startup/bl_ui/space_image.py
source/blender/collada/DocumentImporter.cpp