Changeset 485 for trunk/src/engine

Timestamp:

01/26/16 18:59:46 (9 years ago)

Author:

epyon

Message:

• massive update (need to start doing atomics again) :/

Location:

trunk/src/engine

Files:

• material_manager.cc (modified) (1 diff)
• resource_system.cc (modified) (1 diff)

trunk/src/engine/material_manager.cc

@@ -21 +21 @@
                         if ( !mat->paths[i].empty() )
                                 if ( auto data = m_image_manager->get( mat->paths[i] ).lock() )
+                                {
                                         result->textures[i] = m_context->get_device()->create_texture( &*data, smp );
+                                }
                 add( id, result );
                 return true;

trunk/src/engine/resource_system.cc

@@ -34 +34 @@
         }
 }
-