Merge branch 'master' into coverity_scan
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 12 Sep 2016 10:42:11 +0000 (12:42 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 12 Sep 2016 10:42:11 +0000 (12:42 +0200)
commitf51cd4c6d47a28aee56a04a3778be3fcc5e96f12
tree4315b707d6b5434d3d0af2fe2ca4b40386366f88
parenta54835c91d73faa98f5c1ace1b67a37f3714aa17
parent0c00edb40ec2310ff76b350731822a1ea6dc8800
Merge branch 'master' into coverity_scan
code/BlenderLoader.cpp