diff options
| -rw-r--r-- | editor/project_manager.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/editor/bindings_generator.cpp | 5 | ||||
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index a1b2aa3089..1b169076c6 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -446,7 +446,7 @@ private: String::utf8("\n• ") + TTR("Fast rendering of simple scenes.")); } else if (renderer_type == "gl_compatibility") { renderer_info->set_text( - String::utf8("• ") + TTR("Supports desktop, mobile, + web platforms.") + + String::utf8("• ") + TTR("Supports desktop, mobile + web platforms.") + String::utf8("\n• ") + TTR("Least advanced 3D graphics.") + String::utf8("\n• ") + TTR("Intended for low-end/older devices.") + String::utf8("\n• ") + TTR("Uses OpenGL 3 backend (OpenGL 3.3/ES 3.0/WebGL2).") + diff --git a/modules/mono/editor/bindings_generator.cpp b/modules/mono/editor/bindings_generator.cpp index 7ef42247d1..6559cbf75d 100644 --- a/modules/mono/editor/bindings_generator.cpp +++ b/modules/mono/editor/bindings_generator.cpp @@ -2489,9 +2489,12 @@ Error BindingsGenerator::_generate_cs_native_calls(const InternalCall &p_icall, if (!ret_void) { if (return_type->cname != name_cache.type_Variant) { + // Usually the return value takes ownership, but in this case the variant is only used + // for conversion to another return type. As such, the local variable takes ownership. r_output << "using godot_variant " << C_LOCAL_VARARG_RET " = "; } else { - r_output << "using godot_variant " << C_LOCAL_RET " = "; + // Variant's [c_out] takes ownership of the variant value + r_output << "godot_variant " << C_LOCAL_RET " = "; } } diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index f26e05518e..d9f76a6fa6 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -150,7 +150,12 @@ RichTextLabel::Item *RichTextLabel::_get_item_at_pos(RichTextLabel::Item *p_item return it; } } break; - case ITEM_IMAGE: + case ITEM_IMAGE: { + offset += 1; + if (offset > p_position) { + return it; + } + } break; case ITEM_TABLE: { offset += 1; } break; |