Merge changes from the witness.

2011-10-10 20:24:12 +00:00
parent 94401919b8
commit 2ec37026be
35 changed files with 9420 additions and 9328 deletions
--- a/src/nvtt/CubeSurface.h
+++ b/src/nvtt/CubeSurface.h
@ -74,7 +74,7 @@ namespace nvtt

            edgeLength = p.edgeLength;
            for (uint i = 0; i < 6; i++) {
-                face[i] = p.face[6];
+                face[i] = p.face[i];
            }
            solidAngleTable = NULL; // @@ Transfer tables. Needs refcounting?
            vectorTable = NULL;