blender
/
blender
135
420
Fork 602
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

USD: Skeleton and blend shape import #110912

Merged
Michael Kowalski merged 38 commits from makowalski/blender:usdskel_import into main 2023-08-17 20:11:58 +02:00
Conversation 28 Commits 38 Files Changed 15 +3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 85ad6b89a7 - Show all commits

3
source/blender/io/usd/intern/usd_reader_xform.cc
View File

@ -169,6 +169,9 @@ std::optional<XformResult> USDXformReader::get_local_usd_xform(const float time)
return std::nullopt;
}
/* The USD bind transform is a matrix of doubles,
makowalski marked this conversation as resolved Outdated
Sybren A. Stüvel commented 2023-08-17 10:31:04 +02:00
Outdated
Review
Copy Link

As xform is already a pxr::GfMatrix4f, and that's the expected type for a XformResult, why is this cast necessary? Might be worth a comment.

As `xform` is already a `pxr::GfMatrix4f`, and that's the expected type for a `XformResult`, why is this cast necessary? Might be worth a comment.
Michael Kowalski commented 2023-08-17 19:27:00 +02:00
Outdated
Review
Copy Link

That's a good point, and I've added a comment to explain this. xform is a matrix for doubles (GfMatrix4d), but Blender expects a matrix of floats, so I explicitly convert to a GfMatrix4f for the return value.

That's a good point, and I've added a comment to explain this. `xform` is a matrix for doubles (`GfMatrix4d`), but Blender expects a matrix of floats, so I explicitly convert to a `GfMatrix4f` for the return value.
* but we cast it to GfMatrix4f because Blender expects
* a matrix of floats. */
return XformResult(pxr::GfMatrix4f(xform), is_constant);
}