Merge pull request #2147 from gforney/master

fix to code reading cadgeom data
firemodels · Jan 3, 2025 · 31431d6 · 31431d6
2 parents 2e0831b + 0279103
commit 31431d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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;
   }

diff --git 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 ----