From 15f1045580e1f599b43faa7d0cba3683160af485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 29 Oct 2019 09:24:31 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@624 a8b55f48-bf90-11e4-a774-851b48703e85 --- qglview/loader_obj.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qglview/loader_obj.cpp b/qglview/loader_obj.cpp index 586f360..15493ca 100644 --- a/qglview/loader_obj.cpp +++ b/qglview/loader_obj.cpp @@ -214,11 +214,12 @@ GLObjectBase * loadFromOBJFile(const QString & filepath, float scale) { QVector vertices, normals, texcoords; QVector materials; GLObjectBase * root = new GLObjectBase(), * co = nullptr; - QString name; + QString name, line, pline; root->setName(QFileInfo(f).baseName()); int cnt = 0; while (!stream.atEnd()) { - QString line = stream.readLine().trimmed(); + pline = line; + line = stream.readLine().trimmed(); if (line.startsWith("mtllib")) { materials = readMTL(filepath, line.mid(6).trimmed()); continue; @@ -236,6 +237,7 @@ GLObjectBase * loadFromOBJFile(const QString & filepath, float scale) { continue; } if (line.startsWith("g ") || line.startsWith("o ")) { + if (pline.mid(1) == line.mid(1)) continue; name = line.mid(1).trimmed(); if (co != nullptr) { LoaderOBJ::initOBJMesh(co, vertices, normals, texcoords);