History

Merge branch 'master' of https://github.com/highfidelity/hifi into deference

Andrzej Kapolka committed 12 years ago

Commit 9caa4d32 parents 919112f 198b14320 files · +144 −99Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 20 files). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+1−1
@@ -1583,7 +1583,7 @@ int VoxelAugmentVisitor::visit(MetavoxelInfo& info) { · 1582 unmodified lines
1583 for (int z = 0; z < expanded; z++) {1583 for (int z = 0; z < expanded; z++) {
1584 const QRgb* colorY = colorZ;1584 const QRgb* colorY = colorZ;
1585 for (int y = 0; y < expanded; y++) {1585 for (int y = 0; y < expanded; y++) {
1586 int lastIndex;1586 int lastIndex = 0;
1587 const QRgb* colorX = colorY;1587 const QRgb* colorX = colorY;
1588 for (int x = 0; x < expanded; x++) {1588 for (int x = 0; x < expanded; x++) {
1589 int alpha0 = colorX[0] >> ALPHA_OFFSET;1589 int alpha0 = colorX[0] >> ALPHA_OFFSET;