You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00:00
Merge pull request #107469 from Ivorforce/vector-localvector-explicit-span-conversions
Remove implicit conversions between `LocalVector` and `Vector`
This commit is contained in:
@@ -665,7 +665,7 @@ String GDScriptWorkspace::get_file_uri(const String &p_path) const {
|
||||
}
|
||||
|
||||
// Always return file URI's with authority part (encoding drive letters with leading slash), to maintain compat with RFC-1738 which required it.
|
||||
return "file:///" + String("/").join(encoded_parts);
|
||||
return "file:///" + String("/").join(Vector<String>(encoded_parts));
|
||||
}
|
||||
|
||||
void GDScriptWorkspace::publish_diagnostics(const String &p_path) {
|
||||
|
||||
@@ -2988,9 +2988,9 @@ Error GLTFDocument::_serialize_meshes(Ref<GLTFState> p_state) {
|
||||
}
|
||||
}
|
||||
gltf_texcoord_key = vformat("TEXCOORD_%d", texcoord_i);
|
||||
attributes[gltf_texcoord_key] = _encode_accessor_as_vec2(p_state, first_channel, true);
|
||||
attributes[gltf_texcoord_key] = _encode_accessor_as_vec2(p_state, Vector<Vector2>(first_channel), true);
|
||||
gltf_texcoord_key = vformat("TEXCOORD_%d", texcoord_i + 1);
|
||||
attributes[gltf_texcoord_key] = _encode_accessor_as_vec2(p_state, second_channel, true);
|
||||
attributes[gltf_texcoord_key] = _encode_accessor_as_vec2(p_state, Vector<Vector2>(second_channel), true);
|
||||
}
|
||||
}
|
||||
{
|
||||
|
||||
@@ -239,7 +239,7 @@ void AudioStreamMP3::set_data(const Vector<uint8_t> &p_data) {
|
||||
}
|
||||
|
||||
Vector<uint8_t> AudioStreamMP3::get_data() const {
|
||||
return data;
|
||||
return Vector<uint8_t>(data);
|
||||
}
|
||||
|
||||
void AudioStreamMP3::set_loop(bool p_enable) {
|
||||
|
||||
Reference in New Issue
Block a user