Index: trunk/src/gfx/image.cc
===================================================================
--- trunk/src/gfx/image.cc	(revision 374)
+++ trunk/src/gfx/image.cc	(revision 376)
@@ -7,5 +7,5 @@
 using namespace nv;
 
-image::image( glm::ivec2 size, size_t depth )
+image::image( glm::ivec2 size, nv::size_t depth )
 	: m_size( size ), m_depth( depth ), m_data( nullptr )
 {
@@ -20,5 +20,5 @@
 
 
-image::image( glm::ivec2 size, size_t depth, const uint8 * data, bool reversed )
+image::image( glm::ivec2 size, nv::size_t depth, const uint8 * data, bool reversed )
 	: m_size( size ), m_depth( depth ), m_data( nullptr )
 {
Index: trunk/src/gfx/keyframed_mesh.cc
===================================================================
--- trunk/src/gfx/keyframed_mesh.cc	(revision 374)
+++ trunk/src/gfx/keyframed_mesh.cc	(revision 376)
@@ -36,5 +36,5 @@
 }
 
-size_t keyframed_mesh::get_max_frames() const
+nv::size_t keyframed_mesh::get_max_frames() const
 {
 	return m_frame_count;
Index: trunk/src/gfx/texture_atlas.cc
===================================================================
--- trunk/src/gfx/texture_atlas.cc	(revision 374)
+++ trunk/src/gfx/texture_atlas.cc	(revision 376)
@@ -11,5 +11,5 @@
 using namespace nv;
 
-texture_atlas::texture_atlas( glm::ivec2 size, size_t depth, size_t border /*= 1*/ )
+texture_atlas::texture_atlas( glm::ivec2 size, nv::size_t depth, nv::size_t border /*= 1*/ )
 	: image( size, depth ), m_used( 0 ), m_border( border )
 {
@@ -82,5 +82,5 @@
 }
 
-int texture_atlas::fit( size_t index, glm::ivec2 size )
+int texture_atlas::fit( nv::size_t index, glm::ivec2 size )
 {
 	glm::ivec3 node = m_nodes[ index ];