solstice

commit 1e09a787bac75d492d38a26312bdd16346a0aa90
parent 2384342d868c006f7a1f069c2754f36edf277492
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 29 Mar 2017 16:19:58 +0200

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

Diffstat:
M
cmake/CMakeLists.txt
 | 
4
++--
M
src/solstice_solve.c
 | 
6
++++++

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -30,7 +30,7 @@ find_package(LibYAML REQUIRED)
 find_package(RCMake 0.2.3 REQUIRED)
 find_package(RSys 0.4 REQUIRED)
 find_package(SolAnim 0.1 REQUIRED)
-find_package(SolSolver 0.1 REQUIRED)
+find_package(SolSolver 0.1.1 REQUIRED)
 find_package(Star3DUT REQUIRED)
 find_package(StarSP 0.4 REQUIRED)
 find_package(StarSTL 0.3 REQUIRED)
@@ -80,7 +80,7 @@ configure_file(${SOLSTICE_SOURCE_DIR}/solstice_args.h.in
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 1)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(SOLSTICE_FILES_SRC
diff --git a/src/solstice_solve.c b/src/solstice_solve.c
@@ -311,8 +311,14 @@ write_per_receiver_mc_primitive
     size_t ishape, nshapes;
     size_t nverts, ntris;
     size_t offset;
+    int mask, prim;
 
     htable_receiver_iterator_next(&it);
+
+    SSOL(instance_is_receiver(inst, &mask, &prim));
+    NCHECK(mask, 0);
+    if(!prim) continue;
+
     SSOL(instance_get_shaded_shapes_count(inst, &nshapes));
 
     /* Write the header */