Merge recent changes from the witness.

2010-08-31 01:39:08 +00:00
parent 47e8f23e9f
commit e8dc679874
44 changed files with 2465 additions and 2216 deletions
--- a/src/nvtt/OutputOptions.h
+++ b/src/nvtt/OutputOptions.h
@ -35,9 +35,7 @@ namespace nvtt
 	{
 		DefaultOutputHandler(const char * fileName) : stream(fileName) {}
 		
-		virtual ~DefaultOutputHandler()
-		{
-		}
+		virtual ~DefaultOutputHandler() {}
 		
 		virtual void beginImage(int size, int width, int height, int depth, int face, int miplevel)
 		{
@ -66,6 +64,7 @@ namespace nvtt

 		bool outputHeader;
 		Container container;
+        int version;
 		
 		bool hasValidOutputHandler() const;