Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Mon, 26 Feb 2018 21:55:15 +0000 (22:55 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Mon, 26 Feb 2018 21:55:15 +0000 (22:55 +0100)
commitedcd30f6ab238435418728833a1f1befbc4facbc
tree151e48904a99c714a80321401341e1c7de5316a5
parentf228a08d027ef700344d35f1ba958249afa93222
parent96285e1ca42bd9fb667a84ef79bf0aea70b6b717
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8