Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Tue, 17 Apr 2018 15:36:39 +0000 (17:36 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 17 Apr 2018 15:36:39 +0000 (17:36 +0200)
commit8a695efe9b2ede0550bd2ca1423ddbecc90a5fa2
tree0351c0cd469d5b050f3648858d2a1e16735bebde
parent2b730763a3ae359c3af972b7f3b76e080e4ba43d
parenta0ef147f29cf2b067fb27b15a1c634d253668e77
Merge remote-tracking branch 'origin/master' into blender2.8