From ccfdf5e003c5eaa8978a50e5ad453c4a7a6c796d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 18 Oct 2020 16:55:20 +0200 Subject: [PATCH] build 2010181. t3d parser fix, crash fix --- Model3d.cpp | 4 ++-- version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Model3d.cpp b/Model3d.cpp index ea0af308..257d0397 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -213,7 +213,7 @@ std::pair TSubModel::Load( cParser &parser, bool dynamic ) auto token { parser.getToken() }; if( token != "type:" ) { std::string errormessage { - "Bad model: expected submodel type definition not found while loading model \"" + pRoot->NameGet() + "\"" + "Bad model: expected submodel type definition not found while loading model \"" + parser.Name() + "\"" + "\ncurrent model data stream content: \"" }; auto count { 10 }; while( ( true == parser.getTokens() ) @@ -509,7 +509,7 @@ std::pair TSubModel::Load( cParser &parser, bool dynamic ) } token = parser.getToken(); } - if( token == "numverts:" ) + if( ( token == "numverts:" ) || ( token == "numverts" ) ) { // normalna lista wierzchołków /* // Ra 15-01: to wczytać jako tekst - jeśli pierwszy znak zawiera "*", to diff --git a/version.h b/version.h index 3ebed691..3b87a5b4 100644 --- a/version.h +++ b/version.h @@ -2,4 +2,4 @@ #define VERSION_MAJOR 20 #define VERSION_MINOR 1018 -#define VERSION_REVISION 0 +#define VERSION_REVISION 1