Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 09:18:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't merge after expansion; it breaks stuff.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-08-21 14:50:58 -07:00
parent 72500630b0
commit 74b39773d6
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/metavoxels/src/AttributeRegistry.cpp
View file

@ -274,9 +274,7 @@ MetavoxelNode* Attribute::expandMetavoxelRoot(const MetavoxelNode& root) {
MetavoxelNode* newGrandchild = new MetavoxelNode(attribute); MetavoxelNode* newGrandchild = new MetavoxelNode(attribute);
newChild->setChild((index + j) % MetavoxelNode::CHILD_COUNT, newGrandchild); newChild->setChild((index + j) % MetavoxelNode::CHILD_COUNT, newGrandchild);
} }
newChild->mergeChildren(attribute);
} }
newParent->mergeChildren(attribute);
return newParent; return newParent;
} }
@ -1501,9 +1499,7 @@ MetavoxelNode* SharedObjectSetAttribute::expandMetavoxelRoot(const MetavoxelNode
MetavoxelNode* newGrandchild = new MetavoxelNode(attribute); MetavoxelNode* newGrandchild = new MetavoxelNode(attribute);
newChild->setChild((index + j) % MetavoxelNode::CHILD_COUNT, newGrandchild); newChild->setChild((index + j) % MetavoxelNode::CHILD_COUNT, newGrandchild);
} }
newChild->mergeChildren(attribute);
} }
newParent->mergeChildren(attribute);
return newParent; return newParent;
} }