Merge branch 'GlowingParticles' of https://github.com/lukaspj/Torque3D into glowParticles

Conflicts:
	Engine/source/renderInstance/renderParticleMgr.cpp
This commit is contained in:
Azaezel 2014-12-16 18:48:28 -06:00
commit 98048fd974
11 changed files with 179 additions and 63 deletions

View file

@ -77,7 +77,9 @@ protected:
// Not only a helper method, but a method for the RenderTranslucentMgr to
// request a particle system draw
void renderInstance(ParticleRenderInst *ri, SceneRenderState *state);
public:
void renderParticle(ParticleRenderInst *ri, SceneRenderState *state);
protected:
bool mOffscreenRenderEnabled;
/// The prepass render target used for the