Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script

Browse source 
Bugfix for legacy sit scripts
This commit is contained in:
Shannon Romano 2019-10-15 16:19:49 -07:00 committed by GitHub
commit bebb21fa9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/animation/src/AnimClip.h
View file

@ -55,6 +55,8 @@ public:
float getFrame() const { return _frame; } float getFrame() const { return _frame; }
void loadURL(const QString& url); void loadURL(const QString& url);
AnimBlendType getBlendType() const { return _blendType; };
protected: protected:
virtual void setCurrentFrameInternal(float frame) override; virtual void setCurrentFrameInternal(float frame) override;

3
libraries/animation/src/Rig.cpp
View file

@ -545,7 +545,8 @@ QStringList Rig::getAnimationRoles() const {
auto clipNode = std::dynamic_pointer_cast<AnimClip>(node); auto clipNode = std::dynamic_pointer_cast<AnimClip>(node);
if (clipNode) { if (clipNode) {
// filter out the userAnims, they are for internal use only. // filter out the userAnims, they are for internal use only.
if (!clipNode->getID().startsWith("userAnim")) { // also don't return additive blend node clips as valid roles.
if (!clipNode->getID().startsWith("userAnim") && clipNode->getBlendType() == AnimBlendType_Normal) {
list.append(node->getID()); list.append(node->getID());
} }
} }