diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-10-10 17:17:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-10 17:17:25 -0400 |
| commit | 2cdcd336ba63702cbf9919bebb279292edf9ba0e (patch) | |
| tree | 9ea43c81fd431397648d9a1292f94519a41b797a /indra/llprimitive/llmodel.cpp | |
| parent | 6efde0ba83b6ce2f2735f0c4a532cc405b8a3a8d (diff) | |
| parent | b277cc6a8fd2a48ed3ba6498734d9fae209d181e (diff) | |
Merge pull request #4783 from RyeMutt/rye/convexdecomp
Introduce initial VHACD based llconvexdecomposition library
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 00ef79ce7f..8055bffd32 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1296,10 +1296,10 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos) } void LLModel::setConvexHullDecomposition( - const LLModel::convex_hull_decomposition& decomp) + const LLModel::convex_hull_decomposition& decomp, const std::vector<LLModel::PhysicsMesh>& decomp_mesh) { mPhysics.mHull = decomp; - mPhysics.mMesh.clear(); + mPhysics.mMesh = decomp_mesh; updateHullCenters(); } |