northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix keying resource properties, closes #24690

Browse Source
This commit is contained in:
Juan Linietsky
2019-01-17 12:29:39 -03:00
parent e4f1b995cc
commit 5e709baba1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_properties.cpp
View File

@ -2397,7 +2397,7 @@ void EditorPropertyResource::_update_menu() {
void EditorPropertyResource::_sub_inspector_property_keyed(const String &p_property, const Variant &p_value, bool) { 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) { void EditorPropertyResource::_sub_inspector_resource_selected(const RES &p_resource, const String &p_property) {

2
scene/resources/shape_2d.cpp
View File

@ -85,7 +85,7 @@ Array Shape2D::collide_and_get_contacts(const Transform2D &p_local_xform, const
int contacts = 0; 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)) 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; Array results;
results.resize(contacts * 2); results.resize(contacts * 2);