Merge branch 'master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 27 Feb 2018 20:06:29 +0000 (21:06 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 27 Feb 2018 20:06:29 +0000 (21:06 +0100)
commit0f6c08c8cfa7bb28dac6e527c684bc0a016bed11
tree3d0994b217fe3e6a8f54953d35dd1eaaa85a10d1
parent1a65168c4202a76cfacaafb6c1175b56d82d7123
parent450be3b226ad4447dd53ada62ebb46f9fa9f64dd
Merge branch 'master' into blender2.8