summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-05-15 09:34:59 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-05-15 09:34:59 +0200
commite2f27a2248cd472f208b25b83296ce9eae7ee830 (patch)
tree44a179c027edd5a0eb8060ea8f5e03d70d699272
parent716f788b98074ddceb236f714f23a2ddcd430501 (diff)
parent444d211a8ddbb94f41442539c1b033b01a45cf7b (diff)
downloadredot-engine-e2f27a2248cd472f208b25b83296ce9eae7ee830.tar.gz
Merge pull request #77042 from dioptryk/obj-vertex-colors-master
Add support for non-standard OBJ vertex entries
-rw-r--r--editor/import/resource_importer_obj.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp
index 89e2e36b77..adc21aaa7b 100644
--- a/editor/import/resource_importer_obj.cpp
+++ b/editor/import/resource_importer_obj.cpp
@@ -267,7 +267,7 @@ static Error _parse_obj(const String &p_path, List<Ref<Mesh>> &r_meshes, bool p_
vtx.z = v[3].to_float() * scale_mesh.z + offset_mesh.z;
vertices.push_back(vtx);
//vertex color
- if (v.size() == 7) {
+ if (v.size() >= 7) {
while (colors.size() < vertices.size() - 1) {
colors.push_back(Color(1.0, 1.0, 1.0));
}