star-cad

commit 0a837e6c6ec2a95fa4ad6f816c456b10cb51f265
parent 852637a5b180f6c10703e83109019827b0a2400c
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri,  9 Sep 2022 15:55:05 +0200

Merge remote-tracking branch 'origin/develop' into develop

Diffstat:
M
src/scad.h
 | 
3
++-
M
src/scad_geometry.c
 | 
8
++++----

2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/scad.h b/src/scad.h
@@ -257,7 +257,8 @@ scad_geometries_partition_one
 SCAD_API res_T
 scad_geometry_boundary
   (const char* name, /* Can be NULL */
-   const struct scad_geometry* geom,
+   const struct scad_geometry** geometries,
+   const size_t geometries_count,
    struct scad_geometry** out_boundary);
 
 /* copy the geometry `geom'. */
diff --git a/src/scad_geometry.c b/src/scad_geometry.c
@@ -1136,7 +1136,8 @@ scad_geometries_partition
 res_T
 scad_geometry_boundary
   (const char* name,
-   const struct scad_geometry* in_geom,
+   const struct scad_geometry** geometries,
+   const size_t geometries_count,
    struct scad_geometry** out_geometry)
 {
   int* tagout = NULL;
@@ -1146,7 +1147,7 @@ scad_geometry_boundary
   struct scad_geometry* geom = NULL;
   res_T res = RES_OK;
 
-  if(!in_geom || !out_geometry) {
+  if(!geometries || !out_geometry) {
     res = RES_BAD_ARG;
     goto error;
   }
@@ -1155,8 +1156,7 @@ scad_geometry_boundary
     ERR(scad_synchronize());
   }
 
-  sz = in_geom->gmsh_dimTags_n;
-  data = in_geom->gmsh_dimTags;
+  ERR(gather_tags(geometries, geometries_count, SIZE_MAX, &data, &sz));
   gmshModelGetBoundary(data, sz, &tagout, &tagoutn, 1, 0, 0, &ierr);
   ERR(gmsh_err_to_res_T(ierr));