TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 08:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update bitmapSTB.cpp

Browse source
This commit is contained in:
marauder2k7 2025-05-30 04:00:45 +01:00
parent 849f3e9cb2
commit ea751eb62f
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp
View file

@ -100,8 +100,6 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
S32 x, y, n, channels; S32 x, y, n, channels;
String ext = path.getExtension(); String ext = path.getExtension();
U32 prevWaterMark = FrameAllocator::getWaterMark();
// if this is an ies profile we need to create a texture for it. // if this is an ies profile we need to create a texture for it.
if (ext.equal("ies")) if (ext.equal("ies"))
{ {
@ -131,8 +129,6 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
stbi_image_free(data); stbi_image_free(data);
FrameAllocator::setWaterMark(prevWaterMark);
return true; return true;
} }
else else
@ -190,8 +186,6 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
stbi_image_free(dataChar); stbi_image_free(dataChar);
FrameAllocator::setWaterMark(prevWaterMark);
sWriteSTB(textureName, bitmap, 10); sWriteSTB(textureName, bitmap, 10);
return true; return true;
@ -201,7 +195,6 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
if (!stbi_info(path.getFullPath().c_str(), &x, &y, &channels)) if (!stbi_info(path.getFullPath().c_str(), &x, &y, &channels))
{ {
FrameAllocator::setWaterMark(prevWaterMark);
const char* stbErr = stbi_failure_reason(); const char* stbErr = stbi_failure_reason();
if (!stbErr) if (!stbErr)
@ -243,8 +236,6 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
stbi_image_free(data); stbi_image_free(data);
FrameAllocator::setWaterMark(prevWaterMark);
return true; return true;
} }
} }
@ -271,8 +262,6 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
//stbi_image_free(data); //stbi_image_free(data);
stbi_image_free(dataChar); stbi_image_free(dataChar);
FrameAllocator::setWaterMark(prevWaterMark);
return true; return true;
} }
@ -296,7 +285,6 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
format = GFXFormatR8G8B8A8; format = GFXFormatR8G8B8A8;
break; break;
default: default:
FrameAllocator::setWaterMark(prevWaterMark);
return false; return false;
} }
@ -316,8 +304,6 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
if (channels == 4) if (channels == 4)
bitmap->checkForTransparency(); bitmap->checkForTransparency();
FrameAllocator::setWaterMark(prevWaterMark);
return true; return true;
} }