Merge branch 'blender-v2.82-release'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Jan 2020 12:03:15 +0000 (13:03 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Jan 2020 12:03:15 +0000 (13:03 +0100)
1  2 
source/blender/usd/intern/usd_capi.cc

Simple merge