Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add contains_char() for single-character 'contains' calls.

Browse source
This commit is contained in:
Lukas Tenbrink 2024-12-05 17:56:08 +01:00
parent eb5103093c
commit b5c31ebb41
61 changed files with 108 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp
View file

@ -34,7 +34,7 @@ const uint32_t PROP_EDITOR_SCRIPT_VAR = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_S
bool EditorSceneExporterGLTFSettings::_set(const StringName &p_name, const Variant &p_value) {
String name_str = String(p_name);
if (name_str.contains("/")) {
if (name_str.contains_char('/')) {
return _set_extension_setting(name_str, p_value);
}
if (p_name == StringName("image_format")) {
@ -55,7 +55,7 @@ bool EditorSceneExporterGLTFSettings::_set(const StringName &p_name, const Varia
bool EditorSceneExporterGLTFSettings::_get(const StringName &p_name, Variant &r_ret) const {
String name_str = String(p_name);
if (name_str.contains("/")) {
if (name_str.contains_char('/')) {
return _get_extension_setting(name_str, r_ret);
}
if (p_name == StringName("image_format")) {

2
modules/gltf/gltf_document.cpp
View file

@ -4078,7 +4078,7 @@ Error GLTFDocument::_parse_images(Ref<GLTFState> p_state, const String &p_base_p
if (uri.begins_with("data:")) { // Embedded data using base64.
data = _parse_base64_uri(uri);
// mimeType is optional, but if we have it defined in the URI, let's use it.
if (mime_type.is_empty() && uri.contains(";")) {
if (mime_type.is_empty() && uri.contains_char(';')) {
// Trim "data:" prefix which is 5 characters long, and end at ";base64".
mime_type = uri.substr(5, uri.find(";base64") - 5);
}