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

CR feedback

Browse source
This commit is contained in:
ZappoMan 2013-05-22 14:13:38 -07:00
parent cb96b34f9a
commit 47c4ff887e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/voxels/src/VoxelTree.cpp
View file

@ -424,15 +424,13 @@ void VoxelTree::reaverageVoxelColors(VoxelNode *startNode) {
} }
} }
if (hasChildren) { // collapseIdenticalLeaves() returns true if it collapses the leaves
bool childrenCollapsed = startNode->collapseIdenticalLeaves(); // in which case we don't need to set the average color
if (hasChildren && !startNode->collapseIdenticalLeaves()) {
if (!childrenCollapsed) {
startNode->setColorFromAverageOfChildren(); startNode->setColorFromAverageOfChildren();
} }
} }
} }
}
void VoxelTree::loadVoxelsFile(const char* fileName, bool wantColorRandomizer) { void VoxelTree::loadVoxelsFile(const char* fileName, bool wantColorRandomizer) {
int vCount = 0; int vCount = 0;