Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 12 Jul 2017 09:49:43 +0000 (11:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 12 Jul 2017 09:49:43 +0000 (11:49 +0200)
commit59b93123e9af8f4ab4fa6c51f24ad8fc3fbb1129
treebfe01055f7fd6c6fe264cb0dae15f79b7533b3be
parente5ee6cb448b3d54aa129aa5407ee0b2591431001
parent87164114a306d5dc9f609695c0c6a8e36d79673d
Merge branch 'master' into blender2.8