Page MenuHome

USD: Support building against USD 21.11+
ClosedPublic

Authored by Ray Molenkamp (LazyDodo) on Feb 23 2022, 6:26 PM.

Details

Summary

For 3.2 USD will be bumped to a newer version (21.11 or 22.03)
with some slight API changes, however since we cannot simultaneously
land the libs for all platforms as well as these code changes,
we'll sadly have to support both 21.02 and 21.11+ for at least a
short period of time, which does sadly make the code a little "stinky"

@Michael Kowalski (makowalski) did most of the work here, I just added the ugly hacks
needed to bring back 21.02 support. He left a few TODO's and I'm
not entirely sure if these need to be resolved before landing or not.

tested against USD 21.02, 21.11 and 22.03 however even when I had
the sunlamp commented out I had no test failures, so test coverage
could probably be better (perhaps a fun short GSOC idea?)

Diff Detail

Repository
rB Blender
Branch
tmp_usd_update (branched from master)
Build Status
Buildable 20706
Build 20706: arc lint + arc unit

Event Timeline

Ray Molenkamp (LazyDodo) requested review of this revision.Feb 23 2022, 6:26 PM
Ray Molenkamp (LazyDodo) created this revision.

@Ray Molenkamp (LazyDodo) Thanks for creating the patch. To clarify, the one new TODO I added for myself is to be addressed later. It's to add missing functionality (setting the distant light angle on export) which is unrelated to the USD upgrade.

[the TODO] is unrelated to the USD upgrade.

Then let's not have it in this patch.

The patch LGTM apart from the tiniest of things, so no need to re-review after addressing those.

source/blender/io/usd/intern/usd_writer_light.cc
40

Newline can be removed. Normally I don't nit these picks in a review, but the rest is so nicely formatted ♥

This revision is now accepted and ready to land.Mar 10 2022, 11:30 AM