godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83056 from AThousandShips/surface_fix 

Fix incorrect check in `_dict_to_surf`
This commit is contained in:
Rémi Verschelde 2023-10-09 23:25:16 +02:00
parent 9694f1d48c 7b6621297b
commit 3d4724b381
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/rendering_server.cpp
View File

@ -1833,9 +1833,7 @@ static RS::SurfaceData _dict_to_surf(const Dictionary &p_dictionary) {
RS::SurfaceData sd;
sd.primitive = RS::PrimitiveType(int(p_dictionary["primitive"]));
if (p_dictionary.has("uv_scale")) {
sd.format = p_dictionary["format"];
}
sd.format = p_dictionary["format"];
sd.vertex_data = p_dictionary["vertex_data"];
if (p_dictionary.has("attribute_data")) {
sd.attribute_data = p_dictionary["attribute_data"];
@ -1853,7 +1851,9 @@ static RS::SurfaceData _dict_to_surf(const Dictionary &p_dictionary) {
}
sd.aabb = p_dictionary["aabb"];
sd.uv_scale = p_dictionary["uv_scale"];
if (p_dictionary.has("uv_scale")) {
sd.uv_scale = p_dictionary["uv_scale"];
}
if (p_dictionary.has("lods")) {
Array lods = p_dictionary["lods"];