Browse Source

-fixed a crash when closing scene with animationplayer open
-removed item checked print, closes #3564

Juan Linietsky 9 years ago
parent
commit
499308e482

+ 5 - 1
tools/editor/plugins/animation_player_editor_plugin.cpp

@@ -621,10 +621,11 @@ void AnimationPlayerEditor::ensure_visibility() {
 
 Dictionary AnimationPlayerEditor::get_state() const {
 
+
 	Dictionary d;
 
 	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["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 (!EditorNode::get_singleton()->get_edited_scene())
+			return;
+
 		Node *n = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["player"]);
 		if (n && n->cast_to<AnimationPlayer>()) {
 			player=n->cast_to<AnimationPlayer>();

+ 1 - 1
tools/editor/plugins/script_editor_plugin.cpp

@@ -609,7 +609,7 @@ void ScriptEditor::_breaked(bool p_breaked,bool p_can_debug) {
 
 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) {