Merge pull request #3672 from ey6es/metavoxels

Fix for metavoxel stream crash/crash on exit.

interface/src/MetavoxelSystem.cpp

@@ -48,6 +48,13 @@ MetavoxelSystem::NetworkSimulation::NetworkSimulation(float dropRate, float repe
     bandwidthLimit(bandwidthLimit) {
 }    
 
+MetavoxelSystem::~MetavoxelSystem() {
+    // kill the updater before we delete our network simulation objects
+    _updater->thread()->quit();
+    _updater->thread()->wait();
+    _updater = NULL;
+}
+
 void MetavoxelSystem::init() {
     MetavoxelClientManager::init();
     DefaultMetavoxelRendererImplementation::init();

interface/src/MetavoxelSystem.h

@@ -43,6 +43,8 @@ public:
             int maximumDelay = 0, int bandwidthLimit = 0);
     };
 
+    virtual ~MetavoxelSystem();
+
     virtual void init();
 
     virtual MetavoxelLOD getLOD();

libraries/metavoxels/src/MetavoxelClientManager.cpp

@@ -27,8 +27,10 @@ MetavoxelClientManager::MetavoxelClientManager() :
 }
 
 MetavoxelClientManager::~MetavoxelClientManager() {
-    _updater->thread()->quit();
+    if (_updater) {
-    _updater->thread()->wait();
+        _updater->thread()->quit();
+        _updater->thread()->wait();
+    }
 }
 
 void MetavoxelClientManager::init() {

libraries/metavoxels/src/MetavoxelData.cpp

@@ -1040,6 +1040,9 @@ MetavoxelNode* MetavoxelNode::readSubdivision(MetavoxelStreamState& state) {
 }
 
 void MetavoxelNode::writeSubdivision(MetavoxelStreamState& state) const {
+    if (!state.shouldSubdivide()) {
+        return;
+    }
     bool leaf = isLeaf();
     if (!state.shouldSubdivideReference()) {
         state.base.stream << leaf;