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

Update particleEmitter.cpp

Browse source 
null check around asset
This commit is contained in:
marauder2k7 2025-03-26 07:57:14 +00:00
parent 9ff4c84bc8
commit 9f2ab5a64e
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Engine/source/T3D/fx/particleEmitter.cpp
View file

@ -740,16 +740,19 @@ bool ParticleEmitterData::preload(bool server, String &errorStr)
// otherwise, check that all particles refer to the same texture // otherwise, check that all particles refer to the same texture
else if (particleDataBlocks.size() > 1) else if (particleDataBlocks.size() > 1)
{ {
StringTableEntry txr_name = particleDataBlocks[0]->getTextureAsset()->getImageFile(); if (particleDataBlocks[0]->getTextureAsset().notNull())
for (S32 i = 1; i < particleDataBlocks.size(); i++) {
{ StringTableEntry txr_name = particleDataBlocks[0]->getTextureAsset()->getImageFile();
// warn if particle textures are inconsistent for (S32 i = 1; i < particleDataBlocks.size(); i++)
if (particleDataBlocks[i]->getTextureAsset()->getImageFile() != txr_name) {
{ // warn if particle textures are inconsistent
Con::warnf(ConsoleLogEntry::General, "ParticleEmitterData(%s) particles reference different textures.", getName()); if (particleDataBlocks[i]->getTextureAsset()->getImageFile() != txr_name)
break; {
} Con::warnf(ConsoleLogEntry::General, "ParticleEmitterData(%s) particles reference different textures.", getName());
} break;
}
}
}
} }
} }