Browse Source

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

Juan Linietsky 7 years ago
parent
commit
a714e1a4c7
2 changed files with 6 additions and 2 deletions
  1. 3 2
      editor/editor_file_dialog.cpp
  2. 3 0
      scene/3d/voxel_light_baker.cpp

+ 3 - 2
editor/editor_file_dialog.cpp

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

+ 3 - 0
scene/3d/voxel_light_baker.cpp

@@ -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.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];
 		}
 	}