Changeset 433 for trunk/src/formats

Timestamp:

07/21/15 19:40:00 (10 years ago)

Author:

epyon

Message:

• string.hh split into separate files
• string.hh - removed std::string conversions (header still stays though)

Location:

trunk/src/formats

Files:

• md5_loader.cc (modified) (1 diff)
• obj_loader.cc (modified) (1 diff)

trunk/src/formats/md5_loader.cc

@@ -155 +155 @@
                                         sstream >> shader;
                                         remove_quotes( shader );
-                                        maccess.set_name( make_name( shader ) );
+                                        maccess.set_name( make_name( shader.c_str() ) );
                                         next_line( sstream );
                                 }

trunk/src/formats/obj_loader.cc

@@ -328 +328 @@
                 data_channel_set* result = data_channel_set_creator::create_set( 1 );
                 data_channel_set_creator raccess( result );
-                raccess.set_name( make_name( reader->name ) );
+                raccess.set_name( make_name( reader->name.c_str() ) );
                 uint8* rdata = raccess.add_channel( m_descriptor, reader->size * 3 ).raw_data();