Merge branch 'milek-dev' into gfx-work

2026-03-22 15:05:03 +01:00 · 2018-12-03 23:43:02 +01:00
parent 18ad14bc53 0b152dbcae
commit 3c33bf8133
40 changed files with 987 additions and 571 deletions
--- a/simulationstateserializer.cpp
+++ b/simulationstateserializer.cpp
@@ -334,6 +334,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch
        >> nodedata.range_min
        >> nodedata.name
        >> nodedata.type;
+    if( nodedata.name == "none" ) { nodedata.name.clear(); }
    // type-based deserialization. not elegant but it'll do
    if( nodedata.type == "dynamic" ) {