godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-28 16:07:14 +00:00
Code Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source 
Conflicts:
	modules/multiscript/register_types.cpp
	platform/android/java/src/com/android/godot/GodotLib.java
This commit is contained in:
Juan Linietsky
2014-03-13 23:14:35 -03:00
parent 31ce3c5fd0 81757d2e97
commit 0a717ffee2
24 changed files with 598 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/editor/scene_tree_editor.cpp
View File

@@ -715,7 +715,8 @@ void SceneTreeDialog::_cancel() {
void SceneTreeDialog::_select() {
if (tree->get_selected()) {
emit_signal("selected",tree->get_selected()->get_path());
Node *scene = EditorNode::get_singleton()->get_edited_scene();
emit_signal("selected","/root/" + scene->get_parent()->get_path_to(tree->get_selected()));
hide();
}
}