diff options
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/particles.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/render/particles.cc b/src/render/particles.cc index b772f56..40b79ad 100644 --- a/src/render/particles.cc +++ b/src/render/particles.cc @@ -290,11 +290,14 @@ ParticleSystem::ParticleSystem(const ParticleScript *script, const core::Entity particlesystem_radius = particlesystem_script->radius(); particlesystem_cull = particlesystem_script->cull(); + // allow the script to override itself if (particlesystem_script->entity()) { particlesystem_color.assign(entity->color()); - } else if (particlesystem_script->has_color()) { + } + if (particlesystem_script->has_color()) { particlesystem_color.assign(particlesystem_script->color()); - } else if (particlesystem_script->engine()) { + } + if (particlesystem_script->engine()) { particlesystem_color.assign(entity->model()->enginecolor()); } |