Browse Source

Fix keying resource properties, closes #24690

Juan Linietsky 6 years ago
parent
commit
5e709baba1
2 changed files with 2 additions and 2 deletions
  1. 1 1
      editor/editor_properties.cpp
  2. 1 1
      scene/resources/shape_2d.cpp

+ 1 - 1
editor/editor_properties.cpp

@@ -2397,7 +2397,7 @@ void EditorPropertyResource::_update_menu() {
 
 void EditorPropertyResource::_sub_inspector_property_keyed(const String &p_property, const Variant &p_value, bool) {
 
-	emit_signal("property_keyed_with_value", String(get_edited_property()) + ":" + p_property, p_value);
+	emit_signal("property_keyed_with_value", String(get_edited_property()) + ":" + p_property, p_value, false);
 }
 
 void EditorPropertyResource::_sub_inspector_resource_selected(const RES &p_resource, const String &p_property) {

+ 1 - 1
scene/resources/shape_2d.cpp

@@ -85,7 +85,7 @@ Array Shape2D::collide_and_get_contacts(const Transform2D &p_local_xform, const
 	int contacts = 0;
 
 	if (!Physics2DServer::get_singleton()->shape_collide(get_rid(), p_local_xform, Vector2(), p_shape->get_rid(), p_shape_xform, Vector2(), result, max_contacts, contacts))
-		return Variant();
+		return Array();
 
 	Array results;
 	results.resize(contacts * 2);