Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 26 Apr 2017 08:11:03 +0000 (10:11 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 26 Apr 2017 08:11:03 +0000 (10:11 +0200)
commit3dc6528cd45aa840e4a7782669f01e84671d0247
tree69a611c46bfff6b10beb41541d1f9875ba6663a2
parentab168f63f63d2fd80d86776e16eb1bba46c55689
parent9623d93f14155cc4a1188385bb60845c5ac9d50a
Merge branch 'master' into blender2.8