TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-19 19:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1583 from Azaezel/particleEditorExtension

Browse source 
exposes several datablock entries to the particle editor gui subsystem
This commit is contained in:
Areloch 2016-07-06 22:58:49 -05:00 • committed by GitHub
commit 511746828e
3 changed files with 206 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1702,7 +1702,7 @@ void ParticleEmitter::setupBillboard( Particle *part,
lVerts->color = partCol; } \
// Here we deal with UVs for animated particle (billboard)
if (part->dataBlock->animateTexture)
if (part->dataBlock->animateTexture && !part->dataBlock->animTexFrames.empty())
{
S32 fm = (S32)(part->currentAge*(1.0/1000.0)*part->dataBlock->framesPerSec);
U8 fm_tile = part->dataBlock->animTexFrames[fm % part->dataBlock->numFrames];