Index: trunk/src/gfx/keyframed_mesh.cc
===================================================================
--- trunk/src/gfx/keyframed_mesh.cc	(revision 427)
+++ trunk/src/gfx/keyframed_mesh.cc	(revision 428)
@@ -40,5 +40,5 @@
 	m_pbuffer      = buffer();
 
-	if ( m_tag_map && m_tag_map->get_count() > 0 )
+	if ( m_tag_map && m_tag_map->size() > 0 )
 	{
 		m_interpolation_key = (*m_tag_map)[ 0 ]->get_interpolation_key();
@@ -54,5 +54,5 @@
 {
 	if ( !m_tag_map ) return transform();
-	NV_ASSERT( node_id < m_tag_map->get_count(), "TAGMAP FAIL" );
+	NV_ASSERT( node_id < m_tag_map->size(), "TAGMAP FAIL" );
 	NV_ASSERT( (*m_tag_map)[node_id]->size() > 0, "TAG FAIL" );
 	raw_channel_interpolator interpolator( ( *m_tag_map )[node_id], m_interpolation_key );
Index: trunk/src/gfx/mesh_creator.cc
===================================================================
--- trunk/src/gfx/mesh_creator.cc	(revision 427)
+++ trunk/src/gfx/mesh_creator.cc	(revision 428)
@@ -16,7 +16,6 @@
 	merge_keys();
 	uint32 max_frames = 0;
-	for ( size_t i = 0; i < m_data->get_count(); ++i )
-	{
-		data_channel_set* keys = m_data->m_data[i];
+	for ( auto keys : m_data->m_data )
+	{
 		sint16 parent_id = keys->get_parent_id();
 		data_channel_set* pkeys  = ( parent_id != -1 ? m_data->m_data[parent_id] : nullptr );
@@ -49,5 +48,5 @@
 void nv::mesh_nodes_creator::merge_keys()
 {
-	for ( size_t i = 0; i < m_data->get_count(); ++i )
+	for ( size_t i = 0; i < m_data->size(); ++i )
 	{
 		data_channel_set* old_keys = m_data->m_data[i];
@@ -100,7 +99,6 @@
 	mat4 post_transform( 1.f/scale * ri33 ); 
 
-	for ( size_t i = 0; i < m_data->get_count(); ++i )
-	{
-		data_channel_set* node = m_data->m_data[i];
+	for ( auto node : m_data->m_data )
+	{
 		node->m_transform = pre_transform * node->m_transform * post_transform;
 
Index: trunk/src/gfx/skeletal_mesh.cc
===================================================================
--- trunk/src/gfx/skeletal_mesh.cc	(revision 427)
+++ trunk/src/gfx/skeletal_mesh.cc	(revision 428)
@@ -18,8 +18,8 @@
 
 	m_pntdata.assign( pnt_chan->data_cast< md5_vtx_pnt >(), pnt_chan->size() );
-	m_bone_offset.resize( bones->get_count() );
-	m_transform.resize( bones->get_count() );
-
-	for ( uint32 i = 0; i < bones->get_count(); ++i )
+	m_bone_offset.resize( bones->size() );
+	m_transform.resize( bones->size() );
+
+	for ( uint32 i = 0; i < bones->size(); ++i )
 	{
 		m_bone_offset[i] = transform( (*bones)[i]->get_transform() );
@@ -110,5 +110,5 @@
 
 	float frame_num = new_time * m_node_data->get_frame_rate();
-	for ( size_t i = 0; i < m_node_data->get_count(); ++i )
+	for ( size_t i = 0; i < m_node_data->size(); ++i )
 	{
 		raw_channel_interpolator interpolator( (*m_node_data)[i], m_interpolation_key );
@@ -122,6 +122,5 @@
 	m_children  = nullptr;
 	m_offsets   = nullptr;
-	uint32 node_count = m_node_data->get_count();
-	m_bone_ids  = new sint16[ node_count ];
+	m_bone_ids  = new sint16[m_node_data->size()];
 
 	NV_ASSERT( m_node_data, "node data empty!" );
@@ -129,6 +128,6 @@
 	if ( !m_node_data->is_flat() )
 	{
-		m_children = new vector< uint32 >[ node_count ];
-		for ( uint32 n = 0; n < node_count; ++n )
+		m_children = new vector< uint32 >[m_node_data->size()];
+		for ( uint32 n = 0; n < m_node_data->size(); ++n )
 		{
 			const data_channel_set* node = (*m_node_data)[n];
@@ -153,8 +152,8 @@
 	}
 
-	for ( uint32 n = 0; n < m_node_data->get_count(); ++n )
+	for ( uint32 n = 0; n < m_node_data->size(); ++n )
 		if ( m_bone_ids[n] >= 0 )
 		{
-			const data_channel_set* node = m_node_data->get_node(n);
+			const data_channel_set* node = (*m_node_data)[n];
 			nv::mat4 node_mat( node->get_transform() );
 
@@ -174,15 +173,15 @@
 	if ( m_prepared ) return;
 	unordered_map< uint64, uint16 > bone_names;
-	m_offsets = new mat4[ bones->get_count() ];
-	for ( nv::uint16 bi = 0; bi < bones->get_count(); ++bi )
-	{
-		const data_channel_set* bone = bones->get_node( bi );
+	m_offsets = new mat4[ bones->size() ];
+	for ( nv::uint16 bi = 0; bi < bones->size(); ++bi )
+	{
+		const data_channel_set* bone = (*bones)[ bi ];
 		bone_names[ bone->get_name() ] = bi;
 		m_offsets[bi] = bone->get_transform();
 	}
 
-	for ( uint32 n = 0; n < m_node_data->get_count(); ++n )
-	{
-		const data_channel_set* node = m_node_data->get_node( n );
+	for ( uint32 n = 0; n < m_node_data->size(); ++n )
+	{
+		const data_channel_set* node = (*m_node_data)[ n ];
 		sint16 bone_id = -1;
 
@@ -205,5 +204,5 @@
 	// TODO: fix transforms, which are now embedded,
 	//       see note in assimp_loader.cc:load_node
-	const data_channel_set* node = m_node_data->get_node( node_id );
+	const data_channel_set* node = ( *m_node_data )[ node_id ];
 	mat4 node_mat( node->get_transform() );
 
@@ -242,5 +241,5 @@
 	if ( m_bone_data )
 	{
-		m_transform = new mat4[ m_bone_data->get_count() ];
+		m_transform = new mat4[ m_bone_data->size() ];
 	}
 }
@@ -259,5 +258,5 @@
 {
 	if ( m_bone_data )
-		m_context->get_device()->set_opt_uniform_array( a_program, "nv_m_bones", m_transform, m_bone_data->get_count() );
+		m_context->get_device()->set_opt_uniform_array( a_program, "nv_m_bones", m_transform, m_bone_data->size() );
 }