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

Fixed bug where all file dialogs requested thumbnails even if hidden.

Browse Source
This commit is contained in:
Juan Linietsky
2017-12-19 12:57:46 -03:00
parent 8b01b2e85c
commit a714e1a4c7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_file_dialog.cpp
View File

@@ -107,8 +107,8 @@ void EditorFileDialog::_notification(int p_what) {
fav_up->set_icon(get_icon("MoveUp", "EditorIcons")); fav_up->set_icon(get_icon("MoveUp", "EditorIcons"));
fav_down->set_icon(get_icon("MoveDown", "EditorIcons")); fav_down->set_icon(get_icon("MoveDown", "EditorIcons"));
fav_rm->set_icon(get_icon("Remove", "EditorIcons")); fav_rm->set_icon(get_icon("Remove", "EditorIcons"));
// DO NOT CALL UPDATE FILE LIST HERE, ALL HUNDREDS OF HIDDEN DIALOGS WILL RESPOND, CALL INVALIDATE INSTEAD
update_file_list(); invalidate();
} }
} }
@@ -637,6 +637,7 @@ bool EditorFileDialog::_is_open_should_be_disabled() {
return false; return false;
} }
// DO NOT USE THIS FUNCTION UNLESS NEEDED, CALL INVALIDATE() INSTEAD.
void EditorFileDialog::update_file_list() { void EditorFileDialog::update_file_list() {
int thumbnail_size = EditorSettings::get_singleton()->get("filesystem/file_dialog/thumbnail_size"); int thumbnail_size = EditorSettings::get_singleton()->get("filesystem/file_dialog/thumbnail_size");

3
scene/3d/voxel_light_baker.cpp
View File

@@ -1709,6 +1709,9 @@ Vector3 VoxelLightBaker::_compute_ray_trace_at_pos(const Vector3 &p_pos, const V
accum.y += light[cell].accum[i][1] * amount; accum.y += light[cell].accum[i][1] * amount;
accum.z += light[cell].accum[i][2] * amount; accum.z += light[cell].accum[i][2] * amount;
} }
accum.x += cells[cell].emission[0];
accum.y += cells[cell].emission[1];
accum.z += cells[cell].emission[2];
} }
} }