godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

-fixed many memory initialization issues

Browse Source 
-fixed deadlock on previews thread
-fixed compilation errors on unix
This commit is contained in:
Juan Linietsky
2015-06-06 22:06:58 -03:00
parent 14c4c1b568
commit b524b40fdc
23 changed files with 80 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/editor/editor_file_dialog.cpp
View File

@@ -348,7 +348,6 @@ void EditorFileDialog::_push_history() {
}
}
void EditorFileDialog::_item_dc_selected(int p_item) {
@@ -672,7 +671,7 @@ void EditorFileDialog::set_current_dir(const String& p_dir) {
dir_access->change_dir(p_dir);
update_dir();
invalidate();
_push_history();
//_push_history();
}
@@ -852,8 +851,8 @@ void EditorFileDialog::_favorite_move_up(){
if (current>0 && current<favorites->get_item_count()) {
Vector<String> favorited = EditorSettings::get_singleton()->get_favorite_dirs();
int a_idx=favorited.find(favorites->get_item_metadata(current-1));
int b_idx=favorited.find(favorites->get_item_metadata(current));
int a_idx=favorited.find(String(favorites->get_item_metadata(current-1)));
int b_idx=favorited.find(String(favorites->get_item_metadata(current)));
if (a_idx==-1 || b_idx==-1)
return;
@@ -873,8 +872,8 @@ void EditorFileDialog::_favorite_move_down(){
if (current>=0 && current<favorites->get_item_count()-1) {
Vector<String> favorited = EditorSettings::get_singleton()->get_favorite_dirs();
int a_idx=favorited.find(favorites->get_item_metadata(current+1));
int b_idx=favorited.find(favorites->get_item_metadata(current));
int a_idx=favorited.find(String(favorites->get_item_metadata(current+1)));
int b_idx=favorited.find(String(favorites->get_item_metadata(current)));
if (a_idx==-1 || b_idx==-1)
return;
@@ -1143,6 +1142,7 @@ EditorFileDialog::EditorFileDialog() {
show_hidden_files=true;
display_mode=DISPLAY_THUMBNAILS;
local_history_pos=0;
VBoxContainer *vbc = memnew( VBoxContainer );
add_child(vbc);