From 530fd81af6ff8e5181fa360c99b815649dd2d70a Mon Sep 17 00:00:00 2001 From: gforney Date: Fri, 3 Jan 2025 13:51:49 -0500 Subject: [PATCH 1/2] scripts: update script settings file --- scripts/fds_smv_env.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fds_smv_env.bat b/scripts/fds_smv_env.bat index 438cb3898..68120a70c 100644 --- a/scripts/fds_smv_env.bat +++ b/scripts/fds_smv_env.bat @@ -10,7 +10,7 @@ if exist %userprofile%\.bundle\smv_revision.txt ( :: ---- log entry date ---- -set smvlogdate="2-Jan-2025" +set smvlogdate="3-Jan-2025" :: ---- repo locations ---- From 027910363a44356ead8cbf6acf2bf71366dfb798 Mon Sep 17 00:00:00 2001 From: gforney Date: Fri, 3 Jan 2025 14:54:02 -0500 Subject: [PATCH 2/2] smokeview source: fix check for reading cadgeom data --- Source/shared/readcad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/shared/readcad.c b/Source/shared/readcad.c index d4593588c..c9e4559e7 100644 --- a/Source/shared/readcad.c +++ b/Source/shared/readcad.c @@ -411,7 +411,7 @@ int ReadCADGeom(cadgeomdata *cd, const char *file, GLfloat block_shininess) { int ReadCADGeomToCollection(cadgeom_collection *coll, const char *file, GLfloat block_shininess) { - if(coll->capacity >= (coll->ncadgeom + 1)) { + if(coll->ncadgeom >= coll->capacity){ fprintf(stderr, "CADGeomCollection has exceeded capacity"); return -1; }