Changeset 141

Timestamp:

07/03/13 19:46:30 (12 years ago)

Author:

epyon

Message:

• array2d - fixed [] operator
• mesh - fixed get_attribute

Location:

trunk/nv

Files:

• array2d.hh (modified) (1 diff)
• interface/mesh.hh (modified) (1 diff)

trunk/nv/array2d.hh

@@ -172 +172 @@
                 inline const_reference operator[] ( const ivec2& c ) const 
                 {
-                        NV_ASSERT( c.x >= 0 && c.y >= 0 && x < m_size.x && y < m_size.y, "Bad parameters passed to array2d[]" );
+                        NV_ASSERT( c.x >= 0 && c.y >= 0 && c.x < m_size.x && c.y < m_size.y, "Bad parameters passed to array2d[]" );
                         return m_data[ c.y * m_size.x + c.x ];
                 }

trunk/nv/interface/mesh.hh

@@ -94 +94 @@
                 {
                         map::iterator i = m_map.find( attr );
-                        if ( i != m_map.end() && i->second->get_type() != type_to_enum<T>() ) 
+                        if ( i != m_map.end() && i->second->get_type() != type_to_enum<T>::type ) 
                         {
                                 return ((vertex_attribute<T>*)(i->second));