godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

fix broken merge

Browse Source
This commit is contained in:
Juan Linietsky
2015-12-12 10:21:22 -03:00
parent a2d817405e
commit e19f176765
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -604,8 +604,6 @@ 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);
debugger->set_always_visible(p_show);
} }
void ScriptEditor::_script_created(Ref<Script> p_script) { void ScriptEditor::_script_created(Ref<Script> p_script) {

13
tools/editor/script_editor_debugger.cpp
View File

@@ -1161,23 +1161,10 @@ void ScriptEditorDebugger:: _error_stack_selected(int p_idx){
} }
<<<<<<< HEAD
void ScriptEditorDebugger::set_hide_on_stop(bool p_hide) { void ScriptEditorDebugger::set_hide_on_stop(bool p_hide) {
hide_on_stop=p_hide; hide_on_stop=p_hide;
} }
=======
void ScriptEditorDebugger::set_always_visible(bool p_visible) {
always_visible=p_visible;
if (p_visible)
show();
else
hide();
}
>>>>>>> c3db5d951c1ee938a0c789c78a9bb8045ef8605b
void ScriptEditorDebugger::_bind_methods() { void ScriptEditorDebugger::_bind_methods() {