Merge branch 'blender2.8' into tmp-static-override-insertion
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 3 May 2018 14:02:11 +0000 (16:02 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 3 May 2018 14:02:11 +0000 (16:02 +0200)
commit49407122ea6852704a43cc2df5de0f5179758491
treefff5f06b52a4287ae251142985653f75ec73639b
parent69710301cc69b534ee652a45d4749c2c2410426c
parentb2b9efbe6d35566f67b95ab6273fe4dba728d807
Merge branch 'blender2.8' into tmp-static-override-insertion