Index: trunk/src/gfx/image.cc
===================================================================
--- trunk/src/gfx/image.cc	(revision 533)
+++ trunk/src/gfx/image.cc	(revision 534)
@@ -1,3 +1,3 @@
-// Copyright (C) 2011-2015 ChaosForge Ltd
+// Copyright (C) 2011-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //
@@ -10,5 +10,5 @@
 using namespace nv;
 
-image::image( ivec2 size, nv::size_t depth )
+image::image( ivec2 size, uint32 depth )
 	: m_size( size ), m_depth( depth ), m_data( nullptr )
 {
@@ -23,10 +23,10 @@
 
 
-image::image( ivec2 size, nv::size_t depth, const uint8 * data, bool reversed )
+image::image( ivec2 size, uint32 depth, const uint8 * data, bool reversed )
 	: m_size( size ), m_depth( depth ), m_data( nullptr )
 {
 	NV_ASSERT( size.x >= 0 && size.y >= 0, "bad parameters passed to image!" );
 	sint32 bsize = m_size.x * m_size.y * static_cast<sint32>( m_depth );
-	m_data = new uint8[ size_t( bsize ) ];
+	m_data = new uint8[ uint32( bsize ) ];
 
 	if ( reversed )
@@ -97,6 +97,6 @@
 	uint32 rsizey     = static_cast< uint32 >( r.size.y );
 	const uint8* data = idata->get_data();
-	size_t depth      = idata->get_depth();
-	size_t cdepth     = m_depth > depth ? depth : m_depth;
+	uint32 depth      = idata->get_depth();
+	uint32 cdepth     = m_depth > depth ? depth : m_depth;
 	uint32 dstride    = rsizex * depth;
 
@@ -107,5 +107,5 @@
 		{
 			uint32 xy = pos + x * m_depth;
-			for( size_t e = 0; e < cdepth; ++e )
+			for( uint32 e = 0; e < cdepth; ++e )
 			{
 				m_data[ xy + e ] = data[ y*dstride + x * depth + e ];
Index: trunk/src/gfx/mesh_creator.cc
===================================================================
--- trunk/src/gfx/mesh_creator.cc	(revision 533)
+++ trunk/src/gfx/mesh_creator.cc	(revision 534)
@@ -15,10 +15,10 @@
 void nv::mesh_nodes_creator::merge_keys()
 {
-	for ( size_t i = 0; i < m_data->size(); ++i )
+	for ( uint32 i = 0; i < m_data->size(); ++i )
 	{
 		data_channel_set* old_keys = m_data->m_data[i];
 		if ( old_keys && old_keys->size() > 0 )
 		{
-			size_t chan_count = old_keys->size();
+			uint32 chan_count = old_keys->size();
 			if ( chan_count == 1 
 				&& old_keys->get_channel(0)->descriptor().size() == 1
@@ -516,5 +516,5 @@
 	NV_ASSERT( a.size() % frame_count == 0, "Merge - append first mesh empty!" );
 	NV_ASSERT( b.size() % frame_count == 0, "Merge - append second mesh empty!" );
-	size_t vtx_size = a.element_size();
+	uint32 vtx_size = a.element_size();
 
 	raw_data_channel result = data_channel_creator::create( a.descriptor(), a.size() + b.size() );
@@ -523,5 +523,5 @@
 	if ( frame_count == 1 )
 	{
-		size_t a_size = vtx_size * a.size();
+		uint32 a_size = vtx_size * a.size();
 		raw_copy_n( a.raw_data(), a_size, rdata );
 		raw_copy_n( b.raw_data(), vtx_size * b.size(), rdata + a_size );
@@ -529,10 +529,10 @@
 	else
 	{
-		size_t frame_size_a = ( a.size() / frame_count ) * vtx_size;
-		size_t frame_size_b = ( b.size() / frame_count ) * vtx_size;
-		size_t pos_a = 0;
-		size_t pos_b = 0;
-		size_t pos   = 0;
-		for ( size_t i = 0; i < frame_count; ++i )
+		uint32 frame_size_a = ( a.size() / frame_count ) * vtx_size;
+		uint32 frame_size_b = ( b.size() / frame_count ) * vtx_size;
+		uint32 pos_a = 0;
+		uint32 pos_b = 0;
+		uint32 pos   = 0;
+		for ( uint32 i = 0; i < frame_count; ++i )
 		{
 			raw_copy_n( a.raw_data() + pos_a, frame_size_a, rdata + pos );
Index: trunk/src/gfx/skeleton_instance.cc
===================================================================
--- trunk/src/gfx/skeleton_instance.cc	(revision 533)
+++ trunk/src/gfx/skeleton_instance.cc	(revision 534)
@@ -1,3 +1,3 @@
-// Copyright (C) 2011-2015 ChaosForge Ltd
+// Copyright (C) 2011-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //
Index: trunk/src/gfx/texture_atlas.cc
===================================================================
--- trunk/src/gfx/texture_atlas.cc	(revision 533)
+++ trunk/src/gfx/texture_atlas.cc	(revision 534)
@@ -1,3 +1,3 @@
-// Copyright (C) 2012-2015 ChaosForge Ltd
+// Copyright (C) 2012-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //