star-cad

Geometric operators for computer-aided design
git clone git://git.meso-star.fr/star-cad.git
Log | Files | Refs | README | LICENSE

commit 53b1661de68600d74f6a8674eaccbf59fd5f8e4b
parent e1be928cc0a4bac21c94c895dff4db7de4bcc4bb
Author: Benjamin Piaud <benjamin.piaud@meso-star.com>
Date:   Sat, 18 Feb 2023 18:54:44 +0100

Authorize NULL name for step import function

Diffstat:
Msrc/scad_geometry.c | 12++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/scad_geometry.c b/src/scad_geometry.c @@ -1776,7 +1776,7 @@ scad_step_import struct scad_device* dev = get_device(); res_T res = RES_OK; - if(!filename || !name || !out_geometry || !out_geometry_n) { + if(!filename || !out_geometry || !out_geometry_n) { res = RES_BAD_ARG; goto error; } @@ -1799,10 +1799,14 @@ scad_step_import str_init(allocator, &strname); name_initialized = 1; for(i=0; i<ga_sz; ++i) { - ERR(str_set(&strname, name)); - ERR(str_append_printf(&strname,"_%lu", (unsigned long)i)); + if (name) { + ERR(str_set(&strname, name)); + ERR(str_append_printf(&strname,"_%lu", (unsigned long)i)); + ERR(scad_geometry_create(str_cget(&strname), geom_array+i)); + } else { + ERR(scad_geometry_create(NULL, geom_array+i)); + } - ERR(scad_geometry_create(str_cget(&strname), geom_array+i)); geom_array[i]->gmsh_dimTags_n = 2; geom_array[i]->gmsh_dimTags = MEM_ALLOC(allocator, 2 * sizeof(*geom_array[i]->gmsh_dimTags));