Skip to content

Commit 5ee1384

Browse files
committed
Merge pull request #110506 from TokageItLab/reset-mod
Fix Reset on Save corrupt poses if scene has multiple Skeletons
2 parents ce98fae + 8df0627 commit 5ee1384

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

scene/3d/modifier_bone_target_3d.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ class ModifierBoneTarget3D : public SkeletonModifier3D {
4545
virtual void _process_modification(double p_delta) override;
4646

4747
public:
48+
#ifdef TOOLS_ENABLED
49+
virtual bool is_processed_on_saving() const override { return true; }
50+
#endif
4851
void set_bone_name(const String &p_bone_name);
4952
String get_bone_name() const;
5053
void set_bone(int p_bone);

scene/3d/skeleton_3d.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,11 @@ void Skeleton3D::_notification(int p_what) {
317317
Bone *bonesptr = bones.ptr();
318318
int len = bones.size();
319319

320-
thread_local LocalVector<bool> bone_global_pose_dirty_backup;
320+
LocalVector<bool> bone_global_pose_dirty_backup;
321321

322322
// Process modifiers.
323323

324-
thread_local LocalVector<BonePoseBackup> bones_backup;
324+
LocalVector<BonePoseBackup> bones_backup;
325325
_find_modifiers();
326326
if (!modifiers.is_empty()) {
327327
bones_backup.resize(bones.size());

0 commit comments

Comments
 (0)