From 1b2e3655ad5ab94b767f601f68a9886697bcadd0 Mon Sep 17 00:00:00 2001 From: Luigi Malomo Date: Mon, 29 Nov 2021 09:57:43 +0100 Subject: [PATCH] fixed .obj material import (it was reading only malformed .mtl) --- wrap/io_trimesh/import_obj.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wrap/io_trimesh/import_obj.h b/wrap/io_trimesh/import_obj.h index 974468be..ebd20578 100644 --- a/wrap/io_trimesh/import_obj.h +++ b/wrap/io_trimesh/import_obj.h @@ -1005,7 +1005,7 @@ public: } else first = false; - //strcpy(currentMaterial.name, tokens[1].c_str()); + if(tokens.size() < 2) return false; else if (tokens.size() == 2) @@ -1014,17 +1014,17 @@ public: currentMaterial.materialName = line.substr(7); //space in the name, get everything after "newmtl " } else if (header.compare("Ka")==0) { - if (tokens.size() < 4) { + if (tokens.size() >= 4) { currentMaterial.Ka = Point3fFrom3Tokens(tokens,1); } } else if (header.compare("Kd")==0) { - if (tokens.size() < 4) { + if (tokens.size() >= 4) { currentMaterial.Kd = Point3fFrom3Tokens(tokens,1); } } else if (header.compare("Ks")==0) { - if (tokens.size() < 4) { + if (tokens.size() >= 4) { currentMaterial.Ks = Point3fFrom3Tokens(tokens,1); } }