godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93112 from Hilderin/fix-crash-undo-spriteframes-rename 

Fix Crash when trying to undo SpriteFrames animation rename #93079
This commit is contained in:
Rémi Verschelde 2024-06-13 14:39:15 +02:00
parent e351b89117 4575ccbad9
commit 93447ceb37
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -1476,8 +1476,8 @@ void SpriteFramesEditor::edit(Ref<SpriteFrames> p_frames) {
_fetch_sprite_node(); // Fetch node after set frames.
}
bool SpriteFramesEditor::is_editing() const {
return frames.is_valid();
Ref<SpriteFrames> SpriteFramesEditor::get_sprite_frames() const {
return frames;
}
Variant SpriteFramesEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
@ -2337,7 +2337,11 @@ bool SpriteFramesEditorPlugin::handles(Object *p_object) const {
if (animated_sprite_3d && *animated_sprite_3d->get_sprite_frames()) {
return true;
}
return !frames_editor->is_editing() && Object::cast_to<SpriteFrames>(p_object);
SpriteFrames *frames = Object::cast_to<SpriteFrames>(p_object);
if (frames && (frames_editor->get_sprite_frames().is_null() || frames_editor->get_sprite_frames() == frames)) {
return true;
}
return false;
}
void SpriteFramesEditorPlugin::make_visible(bool p_visible) {

2
editor/plugins/sprite_frames_editor_plugin.h
View File

@ -269,7 +269,7 @@ protected:
public:
void edit(Ref<SpriteFrames> p_frames);
bool is_editing() const;
Ref<SpriteFrames> get_sprite_frames() const;
SpriteFramesEditor();
};