asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

-fixed a crash when closing scene with animationplayer open

Browse source 
-removed item checked print, closes #3564
This commit is contained in:
Juan Linietsky 2016-02-21 11:52:11 -03:00
parent b91b89cf60
commit 499308e482
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/editor/plugins/animation_player_editor_plugin.cpp
View file

@ -621,10 +621,11 @@ void AnimationPlayerEditor::ensure_visibility() {
Dictionary AnimationPlayerEditor::get_state() const { Dictionary AnimationPlayerEditor::get_state() const {
Dictionary d; Dictionary d;
d["visible"]=is_visible(); d["visible"]=is_visible();
if (is_visible() && player) { if (EditorNode::get_singleton()->get_edited_scene() && is_visible() && player) {
d["player"]=EditorNode::get_singleton()->get_edited_scene()->get_path_to(player); d["player"]=EditorNode::get_singleton()->get_edited_scene()->get_path_to(player);
d["animation"]=player->get_current_animation(); d["animation"]=player->get_current_animation();
@ -637,6 +638,9 @@ void AnimationPlayerEditor::set_state(const Dictionary& p_state) {
if (p_state.has("visible") && p_state["visible"]) { if (p_state.has("visible") && p_state["visible"]) {
if (!EditorNode::get_singleton()->get_edited_scene())
return;
Node *n = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["player"]); Node *n = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["player"]);
if (n && n->cast_to<AnimationPlayer>()) { if (n && n->cast_to<AnimationPlayer>()) {
player=n->cast_to<AnimationPlayer>(); player=n->cast_to<AnimationPlayer>();

2
tools/editor/plugins/script_editor_plugin.cpp
View file

@ -609,7 +609,7 @@ void ScriptEditor::_breaked(bool p_breaked,bool p_can_debug) {
void ScriptEditor::_show_debugger(bool p_show) { void ScriptEditor::_show_debugger(bool p_show) {
debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), p_show); // debug_menu->get_popup()->set_item_checked( debug_menu->get_popup()->get_item_index(DEBUG_SHOW), p_show);
} }
void ScriptEditor::_script_created(Ref<Script> p_script) { void ScriptEditor::_script_created(Ref<Script> p_script) {