Changeset 302 for trunk/src/gfx/mesh_creator.cc
- Timestamp:
- 08/07/14 19:06:34 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gfx/mesh_creator.cc
r295 r302 430 430 { 431 431 mesh_raw_channel* old = m_data->m_channels[c]; 432 size_t frame_count = ( old-> is_index()? 1 : old->count / size );432 size_t frame_count = ( old->get_buffer_type() == INDEX_BUFFER ? 1 : old->count / size ); 433 433 m_data->m_channels[c] = append_channels( old, other->m_channels[c], frame_count ); 434 434 NV_ASSERT( m_data->m_channels[c], "Merge problem!" ); 435 if ( old-> is_index())435 if ( old->get_buffer_type() == INDEX_BUFFER ) 436 436 { 437 437 switch ( old->desc.slots[0].etype )
Note: See TracChangeset
for help on using the changeset viewer.