Merge branch 'milek-dev' into gfx-work

2026-03-22 15:05:03 +01:00 · 2019-08-08 15:52:00 +02:00
parent 613bdb91d9 c45081b2eb
commit b2e3ee79c3
4 changed files with 46 additions and 53 deletions
--- a/simulationstateserializer.cpp
+++ b/simulationstateserializer.cpp
@@ -472,6 +472,15 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch
            // model import can potentially fail
            if( instance == nullptr ) { return; }

+            if( instance->Model() != nullptr ) {
+                for( auto const &smokesource : instance->Model()->smoke_sources() ) {
+                    Particles.insert(
+                        smokesource.first,
+                        instance,
+                        smokesource.second );
+                }
+            }
+
            if( false == simulation::Instances.insert( instance ) ) {
                ErrorLog( "Bad scenario: duplicate 3d model instance name \"" + instance->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" );
            }