Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Dec 2018 03:05:16 +0000 (14:05 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Dec 2018 03:05:16 +0000 (14:05 +1100)
commit42126bdf0614c7ba58987b912f60d4a14a58a076
treeeaeef33d926beca7d66e1d6ecb865eb9e689dbc4
parent53928f479c61cd2aa0996b5ea1b027cb75dc0ab5
parent6bc828ed876c938711bf0688e2ff09e9513e29fb
Merge branch 'master' into blender2.8