diff options
| -rw-r--r-- | core/io/multiplayer_api.cpp | 5 | ||||
| -rw-r--r-- | doc/classes/AnimationNodeBlendSpace2D.xml | 6 | ||||
| -rw-r--r-- | drivers/gles2/rasterizer_canvas_gles2.cpp | 4 | ||||
| -rw-r--r-- | editor/editor_properties_array_dict.cpp | 12 | ||||
| -rw-r--r-- | scene/resources/texture.cpp | 4 |
5 files changed, 23 insertions, 8 deletions
diff --git a/core/io/multiplayer_api.cpp b/core/io/multiplayer_api.cpp index 30c5bfcaa7..7680d47620 100644 --- a/core/io/multiplayer_api.cpp +++ b/core/io/multiplayer_api.cpp @@ -122,6 +122,7 @@ void MultiplayerAPI::clear() { connected_peers.clear(); path_get_cache.clear(); path_send_cache.clear(); + packet_cache.clear(); last_send_cache_id = 1; } @@ -131,6 +132,8 @@ void MultiplayerAPI::set_root_node(Node *p_node) { void MultiplayerAPI::set_network_peer(const Ref<NetworkedMultiplayerPeer> &p_peer) { + if (p_peer == network_peer) return; // Nothing to do + if (network_peer.is_valid()) { network_peer->disconnect("peer_connected", this, "_add_peer"); network_peer->disconnect("peer_disconnected", this, "_del_peer"); @@ -857,6 +860,8 @@ void MultiplayerAPI::_bind_methods() { } MultiplayerAPI::MultiplayerAPI() { + rpc_sender_id = 0; + root_node = NULL; clear(); } diff --git a/doc/classes/AnimationNodeBlendSpace2D.xml b/doc/classes/AnimationNodeBlendSpace2D.xml index 55e27fc331..b205c01468 100644 --- a/doc/classes/AnimationNodeBlendSpace2D.xml +++ b/doc/classes/AnimationNodeBlendSpace2D.xml @@ -126,6 +126,12 @@ <member name="y_label" type="String" setter="set_y_label" getter="get_y_label"> </member> </members> + <signals> + <signal name="triangles_updated"> + <description> + </description> + </signal> + </signals> <constants> <constant name="BLEND_MODE_INTERPOLATED" value="0" enum="BlendMode"> </constant> diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 6d1c636f42..14bd71c6eb 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -1826,8 +1826,8 @@ void RasterizerCanvasGLES2::initialize() { glBindBuffer(GL_ARRAY_BUFFER, 0); - uint32_t index_size = GLOBAL_DEF("rendering/limits/buffers/canvas_polygon_index_size_kb", 128); - ProjectSettings::get_singleton()->set_custom_property_info("rendering/limits/buffers/canvas_polygon_index_size_kb", PropertyInfo(Variant::INT, "rendering/limits/buffers/canvas_polygon_index_size_kb", PROPERTY_HINT_RANGE, "0,256,1,or_greater")); + uint32_t index_size = GLOBAL_DEF("rendering/limits/buffers/canvas_polygon_index_buffer_size_kb", 128); + ProjectSettings::get_singleton()->set_custom_property_info("rendering/limits/buffers/canvas_polygon_index_buffer_size_kb", PropertyInfo(Variant::INT, "rendering/limits/buffers/canvas_polygon_index_buffer_size_kb", PROPERTY_HINT_RANGE, "0,256,1,or_greater")); index_size *= 1024; // kb glGenBuffers(1, &data.polygon_index_buffer); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, data.polygon_index_buffer); diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp index dd802bc72e..20cb6ab534 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/editor_properties_array_dict.cpp @@ -360,10 +360,14 @@ void EditorPropertyArray::update_property() { vbox->add_child(hb); hb->add_child(prop); prop->set_h_size_flags(SIZE_EXPAND_FILL); - Button *edit = memnew(Button); - edit->set_icon(get_icon("Edit", "EditorIcons")); - hb->add_child(edit); - edit->connect("pressed", this, "_change_type", varray(edit, i + offset)); + + if (subtype == Variant::NIL) { + Button *edit = memnew(Button); + edit->set_icon(get_icon("Edit", "EditorIcons")); + hb->add_child(edit); + edit->connect("pressed", this, "_change_type", varray(edit, i + offset)); + } + } else { vbox->add_child(prop); } diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index d9ace8d650..4984af57b5 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -324,7 +324,7 @@ bool ImageTexture::is_pixel_opaque(int p_x, int p_y) const { int y = p_y * ah / h; x = CLAMP(x, 0, aw); - y = CLAMP(y, 0, aw); + y = CLAMP(y, 0, ah); return alpha_cache->get_bit(Point2(x, y)); } @@ -791,7 +791,7 @@ bool StreamTexture::is_pixel_opaque(int p_x, int p_y) const { int y = p_y * ah / h; x = CLAMP(x, 0, aw); - y = CLAMP(y, 0, aw); + y = CLAMP(y, 0, ah); return alpha_cache->get_bit(Point2(x, y)); } |