diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2019-01-17 12:29:39 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2019-01-17 12:30:34 -0300 |
| commit | 5e709baba1c815b09d6742c2dd03160b25afb37f (patch) | |
| tree | baf3800e410b0f503b51d59b66d30718d983ccd9 | |
| parent | e4f1b995cc2989a2d039cfd2b006e93653569892 (diff) | |
Fix keying resource properties, closes #24690
| -rw-r--r-- | editor/editor_properties.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/shape_2d.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 72545f6b19..e33b26d9cb 100644 --- a/editor/editor_properties.cpp +++ b/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) { diff --git a/scene/resources/shape_2d.cpp b/scene/resources/shape_2d.cpp index 4a41db38c6..e2407e4423 100644 --- a/scene/resources/shape_2d.cpp +++ b/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); |