Index: trunk/src/formats/assimp_loader.cc
===================================================================
--- trunk/src/formats/assimp_loader.cc	(revision 279)
+++ trunk/src/formats/assimp_loader.cc	(revision 280)
@@ -143,6 +143,6 @@
 	}
 
-	mesh_raw_index_channel* ichannel = mesh_raw_index_channel::create( USHORT, mesh->mNumFaces * 3 );
-	result->set_index_channel( ichannel );
+	mesh_raw_channel* ichannel = mesh_raw_channel::create_index( USHORT, mesh->mNumFaces * 3 );
+	result->add_channel( ichannel );
 	uint16* indices = (uint16*)ichannel->data;
 	for (unsigned int i=0; i<mesh->mNumFaces; i++)
@@ -294,5 +294,6 @@
 		{
 			mesh_data* mesh = model->meshes[m];
-			mesh_raw_channel* channel = mesh->get_channel_data()[0];
+			mesh_raw_channel* channel = mesh->get_raw_channels()[0];
+			NV_ASSERT( !channel->is_index(), "index channel in release_merged!" );
 			assimp_skinned_vtx* va = (assimp_skinned_vtx*)channel->data;
 			for ( unsigned v = 0; v < channel->count; ++v )
Index: trunk/src/formats/md2_loader.cc
===================================================================
--- trunk/src/formats/md2_loader.cc	(revision 279)
+++ trunk/src/formats/md2_loader.cc	(revision 280)
@@ -359,5 +359,5 @@
 	}
 
-	mesh_raw_index_channel* ic = mesh_raw_index_channel::create< uint16 >( m_new_indexes.size() );
+	mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( m_new_indexes.size() );
 	if ( m_new_indexes.size() > 0 )
 	{
@@ -369,5 +369,5 @@
 	result->add_channel( mc_pn );
 	result->add_channel( mc_t );
-	result->set_index_channel( ic );
+	result->add_channel( ic );
 	return result;
 }
Index: trunk/src/formats/md3_loader.cc
===================================================================
--- trunk/src/formats/md3_loader.cc	(revision 279)
+++ trunk/src/formats/md3_loader.cc	(revision 280)
@@ -377,5 +377,5 @@
 	index = 0;
 	sint32 index_base = 0;
-	mesh_raw_index_channel* ic = mesh_raw_index_channel::create< uint16 >( index_count );
+	mesh_raw_channel* ic = mesh_raw_channel::create_index< uint16 >( index_count );
 	uint16* icp = (uint16*)ic->data;
 	for ( sint32 i = 0; i < num_surfaces; ++i )
@@ -396,5 +396,5 @@
 	result->add_channel( mc_pn );
 	result->add_channel( mc_t );
-	result->set_index_channel( ic );
+	result->add_channel( ic );
 	return result;
 }
Index: trunk/src/formats/md5_loader.cc
===================================================================
--- trunk/src/formats/md5_loader.cc	(revision 279)
+++ trunk/src/formats/md5_loader.cc	(revision 280)
@@ -145,9 +145,9 @@
 					sstream >> num_tris;
 
-					mesh_raw_index_channel* ch_i = mesh_raw_index_channel::create<uint32>( num_tris * 3 );
+					mesh_raw_channel* ch_i = mesh_raw_channel::create_index<uint32>( num_tris * 3 );
 					uint32* vtx_i                = (uint32*)ch_i->data;
 					mesh->m_idata                = vtx_i;
 					uint32 idx = 0;
-					mesh->set_index_channel( ch_i );
+					mesh->add_channel( ch_i );
 
 					next_line( sstream );
Index: trunk/src/formats/obj_loader.cc
===================================================================
--- trunk/src/formats/obj_loader.cc	(revision 279)
+++ trunk/src/formats/obj_loader.cc	(revision 280)
@@ -334,5 +334,4 @@
 		channel->desc  = m_descriptor;
 		channel->count = reader->size * 3;
-		channel->size  = reader->raw_size();
 
 		mesh_data* mesh = new mesh_data();