blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

USD import: fix mac build warnings and error.

This commit is contained in:
Michael Kowalski 2022-08-30 19:03:16 -04:00
parent 5156e12a0a
commit 219a71a427
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/io/usd/intern/usd_skel_convert.cc
View File

@ -44,6 +44,7 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_meta_types.h"
#include "DNA_scene_types.h"
#include "BKE_main.h"
#include "BKE_scene.h"
@ -341,7 +342,6 @@ void import_blendshapes(Main *bmain, Object *obj, pxr::UsdPrim prim)
return;
}
blendshapes;
if (!skel_anim.GetBlendShapesAttr().Get(&blendshapes)) {
return;
}
@ -435,7 +435,7 @@ void create_skeleton_curves(Main *bmain,
if (it == joint_to_bone_map.end()) {
/* This joint doesn't correspond to any bone we created.
/* Add null placeholders for the channel curves. */
* Add null placeholders for the channel curves. */
loc_curves.push_back(nullptr);
loc_curves.push_back(nullptr);
loc_curves.push_back(nullptr);
@ -719,7 +719,7 @@ void import_skel_bindings(Main *bmain, Object *mesh_obj, pxr::UsdPrim prim)
for (int i = 0; i < mesh->totvert; ++i) {
/* Offset into the weights array, which is
/* always 0 for constant interpolation. */
* always 0 for constant interpolation. */
int offset = 0;
if (interp == pxr::UsdGeomTokens->vertex) {
offset = i * joint_weights_elem_size;