From 47c4ff887eedd4d9543e342edc1d0c36702411ff Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 22 May 2013 14:13:38 -0700 Subject: [PATCH] CR feedback --- libraries/voxels/src/VoxelTree.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp index 1e0b575c95..642d747687 100644 --- a/libraries/voxels/src/VoxelTree.cpp +++ b/libraries/voxels/src/VoxelTree.cpp @@ -424,12 +424,10 @@ void VoxelTree::reaverageVoxelColors(VoxelNode *startNode) { } } - if (hasChildren) { - bool childrenCollapsed = startNode->collapseIdenticalLeaves(); - - if (!childrenCollapsed) { - startNode->setColorFromAverageOfChildren(); - } + // collapseIdenticalLeaves() returns true if it collapses the leaves + // in which case we don't need to set the average color + if (hasChildren && !startNode->collapseIdenticalLeaves()) { + startNode->setColorFromAverageOfChildren(); } } }