diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-30 17:55:17 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-30 17:55:17 +0800 |
| commit | d1353441f91d5776e1f4e72666f7c9de96eecca5 (patch) | |
| tree | cd22d6ac18a1b64cb5c2a94f793e7d7cf27a8b4b /indra/newview/llvovolume.cpp | |
| parent | 2c8521de6d357d74f5b256cc2f94e9951e654d83 (diff) | |
| parent | 136149d1a196d2c0c15b9977937e64ccd26c1a49 (diff) | |
Merge remote-tracking branch 'secondlife/project/gltf-mesh-import' into gltf-mesh-import
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 6b3dccf89c..d0bdcf132f 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3783,7 +3783,12 @@ bool LLVOVolume::canBeAnimatedObject() const bool LLVOVolume::isAnimatedObject() const { - LLVOVolume *root_vol = (LLVOVolume*)getRootEdit(); + LLViewerObject *root_obj = getRootEdit(); + if (root_obj->getPCode() != LL_PCODE_VOLUME) + { + return false; // at the moment only volumes can be animated + } + LLVOVolume* root_vol = (LLVOVolume*)root_obj; mIsAnimatedObject = root_vol->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG; return mIsAnimatedObject; } |