solstice

commit e906b16998deeba34230e70b29a8fdde66494a2b
parent 2e2e90b74ceaf2d1a34fab90a53d41636bc1439f
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri,  5 May 2017 16:05:37 +0200

Merge branch 'feature_atmosphere' into develop

Diffstat:
M
src/parser/solparser.c
 | 
4
++++
M
src/solstice.c
 | 
1
+

2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/parser/solparser.c b/src/parser/solparser.c
@@ -228,6 +228,10 @@ parser_clear(struct solparser* parser)
   solparser_sun_clear(&parser->sun);
   parser->sun_key = 0;
 
+  /* Atmosphere */
+  solparser_atmosphere_clear(&parser->atmosphere);
+  parser->atmosphere_key = 0;
+
   /* Entities */
   htable_str2sols_clear(&parser->str2entities);
   darray_entity_clear(&parser->entities);
diff --git a/src/solstice.c b/src/solstice.c
@@ -651,6 +651,7 @@ solstice_release(struct solstice* solstice)
   if(solstice->ssol) SSOL(device_ref_put(solstice->ssol));
   if(solstice->scene) SSOL(scene_ref_put(solstice->scene));
   if(solstice->sun) SSOL(sun_ref_put(solstice->sun));
+  if(solstice->atmosphere) SSOL(atmosphere_ref_put(solstice->atmosphere));
   if(solstice->parser) solparser_ref_put(solstice->parser);
   if(solstice->camera) SSOL(camera_ref_put(solstice->camera));
   if(solstice->framebuffer) SSOL(image_ref_put(solstice->framebuffer));