Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2018 17:55:27 +0000 (19:55 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2018 17:55:27 +0000 (19:55 +0200)
commit486ff7e52c031e257f4044ccbc2cdafb807cce32
treee84204cc83e1ddbb8f0acde1ad71f31444a22759
parent54a9136569d975db1e894dca8291fc048f91049d
parent0e0d99161ac60642edcaf0e9795a5ecac02bfbd6
Merge branch 'master' into blender2.8