From 4a74499ea113c85a7d84f2a416d5f3195759078b Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 24 Oct 2013 17:43:38 -0700
Subject: [PATCH] removed asserts and replaced with error messages

---
 libraries/voxels/src/VoxelTree.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp
index 4a76c74596..5e6b312b83 100644
--- a/libraries/voxels/src/VoxelTree.cpp
+++ b/libraries/voxels/src/VoxelTree.cpp
@@ -1011,9 +1011,16 @@ bool VoxelTree::findCapsulePenetration(const glm::vec3& start, const glm::vec3&
 int VoxelTree::encodeTreeBitstream(VoxelNode* node, unsigned char* outputBuffer, int availableBytes, VoxelNodeBag& bag,
                                    EncodeBitstreamParams& params) {
 
-    startEncoding(node);
     // How many bytes have we written so far at this level;
     int bytesWritten = 0;
+
+    // you can't call this without a valid node
+    if (!node) {
+        qDebug("WARNING! encodeTreeBitstream() called with node=NULL\n");
+        return bytesWritten;
+    }
+
+    startEncoding(node);
     
     // If we're at a node that is out of view, then we can return, because no nodes below us will be in view!
     if (params.viewFrustum && !node->isInView(*params.viewFrustum)) {
@@ -1076,12 +1083,15 @@ int VoxelTree::encodeTreeBitstream(VoxelNode* node, unsigned char* outputBuffer,
 int VoxelTree::encodeTreeBitstreamRecursion(VoxelNode* node, unsigned char* outputBuffer, int availableBytes, VoxelNodeBag& bag,
                                             EncodeBitstreamParams& params, int& currentEncodeLevel) const {
 
-    // you can't call this without a valid node
-    assert(node);
-    
     // How many bytes have we written so far at this level;
     int bytesAtThisLevel = 0;
 
+    // you can't call this without a valid node
+    if (!node) {
+        qDebug("WARNING! encodeTreeBitstreamRecursion() called with node=NULL\n");
+        return bytesAtThisLevel;
+    }
+
     // Keep track of how deep we've encoded.
     currentEncodeLevel++;