Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Core/Resources/ConcreteLoaders/TextureLoaderImpl.cpp

Diff revisions: vs.
  @@ -12,7 +12,8 @@
12 12
13 13 if(_descriptor.getEnumValue() == TEXTURE_CUBE_MAP){
14 14 ptr = GFX_DEVICE.newTextureCubemap(_descriptor.getFlag());
15 - }else if(_descriptor.getEnumValue() == TEXTURE_2D_ARRAY || _descriptor.getEnumValue() == TEXTURE_2D_ARRAY_MS) {
15 + }else if(_descriptor.getEnumValue() == TEXTURE_2D_ARRAY ||
16 + _descriptor.getEnumValue() == TEXTURE_2D_ARRAY_MS) {
16 17 ptr = GFX_DEVICE.newTextureArray(_descriptor.getFlag());
17 18 ptr->setNumLayers(_descriptor.getId());
18 19 }else{
  @@ -28,8 +29,10 @@
28 29 }
29 30
30 31 if ( !load( ptr, _descriptor.getName() ) ) {
31 - ERROR_FN( Locale::get( "ERROR_TEXTURE_LOADER_FILE" ), _descriptor.getResourceLocation().c_str(), _descriptor.getName().c_str() );
32 - MemoryManager::SAFE_DELETE( ptr );
32 + ERROR_FN(Locale::get( "ERROR_TEXTURE_LOADER_FILE" ),
33 + _descriptor.getResourceLocation().c_str(),
34 + _descriptor.getName().c_str() );
35 + MemoryManager::DELETE( ptr );
33 36 }
34 37
35 38 return ptr;