Merge branch 'master' of github.com:worklist/hifi into assignment

This commit is contained in:
Stephen Birarda 2013-10-17 14:51:20 -07:00
commit 42de553e32

View file

@ -112,6 +112,10 @@ VoxelNode::~VoxelNode() {
setChildAtIndex(i, NULL);
}
}
// at this point, we should have no children, but we need to drop ourselves from population counts
_singleChildrenCount--;
_childrenCount[0]--;
}
void VoxelNode::markWithChangedTime() {