From a1ce73a85cdd3fdc42fc8663d440d45a1b48997b Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 9 Jan 2009 04:06:42 +0000 Subject: [PATCH] fix particle color --- panda/src/particlesystem/baseParticleRenderer.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/panda/src/particlesystem/baseParticleRenderer.cxx b/panda/src/particlesystem/baseParticleRenderer.cxx index 4db7a12cf2..6efbf7c5c1 100644 --- a/panda/src/particlesystem/baseParticleRenderer.cxx +++ b/panda/src/particlesystem/baseParticleRenderer.cxx @@ -16,6 +16,7 @@ #include "baseParticleRenderer.h" #include "transparencyAttrib.h" +#include "colorAttrib.h" #include "compassEffect.h" //////////////////////////////////////////////////////////////////// @@ -140,7 +141,8 @@ update_alpha_mode(ParticleRendererAlphaMode am) { //////////////////////////////////////////////////////////////////// void BaseParticleRenderer:: enable_alpha() { - _render_state = RenderState::make(TransparencyAttrib::make(TransparencyAttrib::M_alpha)); + _render_state = RenderState::make(TransparencyAttrib::make(TransparencyAttrib::M_alpha), + ColorAttrib::make_vertex()); } //////////////////////////////////////////////////////////////////// @@ -150,5 +152,6 @@ enable_alpha() { //////////////////////////////////////////////////////////////////// void BaseParticleRenderer:: disable_alpha() { - _render_state = RenderState::make(TransparencyAttrib::make(TransparencyAttrib::M_none)); + _render_state = RenderState::make(TransparencyAttrib::make(TransparencyAttrib::M_none), + ColorAttrib::make_vertex()); }