5 files changed, 24 insertions, 9 deletions
diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp
index 78a5571bf0..1edae01754 100644
--- a/scene/resources/dynamic_font.cpp
+++ b/scene/resources/dynamic_font.cpp
@@ -573,7 +573,11 @@ DynamicFontAtSize::~DynamicFontAtSize(){
 void DynamicFont::set_font_data(const Ref<DynamicFontData>& p_data) {
 
 	data=p_data;
-	data_at_size=data->_get_dynamic_font_at_size(size);
+	if (data.is_valid())
+		data_at_size=data->_get_dynamic_font_at_size(size);
+	else
+		data_at_size=Ref<DynamicFontAtSize>();
+
 	emit_changed();
 }
 
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index 5df22ba8cc..5ac7946391 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -545,9 +545,19 @@ https://github.com/godotengine/godot/issues/3127
 			}
 
 #endif
-			if (exists && bool(Variant::evaluate(Variant::OP_EQUAL,value,original))) {
-				//exists and did not change
-				continue;
+			if (exists) {
+
+				//check if already exists and did not change
+				if (value.get_type()==Variant::REAL && original.get_type()==Variant::REAL) {
+					//this must be done because, as some scenes save as text, there might be a tiny difference in floats due to numerical error
+					float a = value;
+					float b = original;
+
+					if (Math::abs(a-b)<CMP_EPSILON)
+						continue;
+				} else if (bool(Variant::evaluate(Variant::OP_EQUAL,value,original))) {
+					continue;
+				}
 			}
 
 			if (!exists && isdefault) {
diff --git a/scene/resources/room.cpp b/scene/resources/room.cpp
index 4024e2f45c..d1fc614c90 100644
--- a/scene/resources/room.cpp
+++ b/scene/resources/room.cpp
@@ -31,7 +31,7 @@
 #include "servers/visual_server.h"
 
 
-RID RoomBounds::get_rid() {
+RID RoomBounds::get_rid() const {
 
 	return area;
 }
diff --git a/scene/resources/room.h b/scene/resources/room.h
index a9f159cd46..3ed41a3e61 100644
--- a/scene/resources/room.h
+++ b/scene/resources/room.h
@@ -50,7 +50,7 @@ protected:
 
 public:
 
-	virtual RID get_rid();
+	virtual RID get_rid() const;
 
 	void set_bounds( const BSP_Tree& p_bounds );
 	BSP_Tree get_bounds() const;
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index 8d0aedbf93..2f4d37053e 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -240,7 +240,7 @@ Ref<Texture> Theme::get_icon(const StringName& p_name,const StringName& p_type)
 
 bool Theme::has_icon(const StringName& p_name,const StringName& p_type) const {
 
-	return (icon_map.has(p_type) && icon_map[p_type].has(p_name));
+	return (icon_map.has(p_type) && icon_map[p_type].has(p_name) && icon_map[p_type][p_name].is_valid());
 }
 
 
@@ -337,12 +337,13 @@ Ref<StyleBox> Theme::get_stylebox(const StringName& p_name,const StringName& p_t
 		return style_map[p_type][p_name];
 	} else {
 		return default_style;
+
 	}
 }
 
 bool Theme::has_stylebox(const StringName& p_name,const StringName& p_type) const {
 
-	return (style_map.has(p_type) && style_map[p_type].has(p_name) );
+	return (style_map.has(p_type) && style_map[p_type].has(p_name) && style_map[p_type][p_name].is_valid());
 }
 
 void Theme::clear_stylebox(const StringName& p_name,const StringName& p_type) {
@@ -402,7 +403,7 @@ Ref<Font> Theme::get_font(const StringName& p_name,const StringName& p_type) con
 
 bool Theme::has_font(const StringName& p_name,const StringName& p_type) const {
 
-	return (font_map.has(p_type) && font_map[p_type].has(p_name));
+	return (font_map.has(p_type) && font_map[p_type].has(p_name) && font_map[p_type][p_name].is_valid());
 }
 
 void Theme::clear_font(const StringName& p_name,const StringName& p_type) {