3 files changed, 9 insertions, 2 deletions
diff --git a/tools/editor/plugins/baked_light_baker.cpp b/tools/editor/plugins/baked_light_baker.cpp
index 6a88ba4cb..a2e94e885 100644
--- a/tools/editor/plugins/baked_light_baker.cpp
+++ b/tools/editor/plugins/baked_light_baker.cpp
@@ -1772,6 +1772,10 @@ void BakedLightBaker::bake(const Ref<BakedLight> &p_light, Node* p_node) {
 	mat_map.clear();
 	tex_map.clear();
 	print_line("\ttotal triangles: "+itos(triangles.size()));
+	// no geometry
+	if (triangles.size() == 0) {
+		return;
+	}
 	ep.step(TTR("Fixing Lights"),1);
 	_fix_lights();
 	ep.step(TTR("Making BVH"),2);
diff --git a/tools/editor/plugins/baked_light_editor_plugin.cpp b/tools/editor/plugins/baked_light_editor_plugin.cpp
index df76f28ae..a58a0c25e 100644
--- a/tools/editor/plugins/baked_light_editor_plugin.cpp
+++ b/tools/editor/plugins/baked_light_editor_plugin.cpp
@@ -206,8 +206,9 @@ void BakedLightEditor::_menu_option(int p_option) {
 void BakedLightEditor::_bake_pressed() {
 
 	ERR_FAIL_COND(!node);
-	if (node->get_baked_light().is_null()) {
-		err_dialog->set_text(TTR("BakedLightInstance does not contain a BakedLight resource."));
+	const String conf_warning = node->get_configuration_warning();
+	if (!conf_warning.empty()) {
+		err_dialog->set_text(conf_warning);
 		err_dialog->popup_centered_minsize();
 		button_bake->set_pressed(false);
 		return;
@@ -236,6 +237,7 @@ void BakedLightEditor::_bake_pressed() {
 		update_timeout=0;
 
 		last_rays_time=0;
+		button_bake->set_pressed(false);
 
 		set_process(true);
 	}
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 1b739e62f..376c0daa6 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -1954,6 +1954,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	completion_cache = memnew( EditorScriptCodeCompletionCache );
 	restoring_layout=false;
 	waiting_update_names=false;
+	pending_auto_reload=false;
 	auto_reload_running_scripts=false;
 	editor=p_editor;