solstice

commit 259e6cc22d86e6d2e77fee73ccc8fdacde8cfd9a
parent 2c87a4cd52ce3b5cc896df367bc2138c32d73e4e
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed,  3 May 2017 15:28:47 +0200

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

Diffstat:
M
src/solstice_object.c
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/solstice_object.c b/src/solstice_object.c
@@ -294,7 +294,7 @@ create_stl
   stl = solparser_get_shape_stl(solstice->parser, stl_id);
   ASSERT(str_cget(&stl->filename));
 
-  res = sstl_create(NULL, solstice->allocator, 0, &tmp_stl);
+  res = sstl_create(NULL, solstice->allocator, 1, &tmp_stl);
   if(res != RES_OK) {
     fprintf(stderr, "Could not create a Solstice Solver STL shape.\n");
     goto error;
@@ -608,9 +608,9 @@ create_shaded_shape
 exit:
   return res;
 error:
-  if(*ssol_front) SSOL(material_ref_put(*ssol_front));
-  if(*ssol_back) SSOL(material_ref_put(*ssol_back));
-  if(*ssol_shape) SSOL(shape_ref_put(*ssol_shape));
+  if(*ssol_front) SSOL(material_ref_put(*ssol_front)), *ssol_front = NULL;
+  if(*ssol_back) SSOL(material_ref_put(*ssol_back)), *ssol_back = NULL;
+  if(*ssol_shape) SSOL(shape_ref_put(*ssol_shape)), *ssol_shape = NULL;
   goto exit;
 }