Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-12-08 23:12:45 +0000
committerStijn Buys <ingar@osirion.org>2012-12-08 23:12:45 +0000
commita1049d85d66264c790fa212f1c577a71890a03c9 (patch)
tree2f93045ffe7ab4038ad0f392656340fde6f30bd0 /src/ui
parentcd4018f65d4933b48688b6fcd11caff75afae263 (diff)
Added support for entity secondary color on lights, flares and particles.
Diffstat (limited to 'src/ui')
-rwxr-xr-xsrc/ui/modelview.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/modelview.cc b/src/ui/modelview.cc
index b8d2a86..71fff6c 100755
--- a/src/ui/modelview.cc
+++ b/src/ui/modelview.cc
@@ -374,7 +374,7 @@ void ModelView::draw_model()
flare->set_texture(render::Textures::load(texturename.str()));
}
- render::draw_model_lights(model, modelscale, math::Vector3f(), modelview_axis, core::localplayer()->color(), thrust, 0.0f);
+ render::draw_model_lights(model, modelscale, math::Vector3f(), modelview_axis, core::localplayer()->color(), core::localplayer()->color_second(), thrust, 0.0f);
gl::disable(GL_TEXTURE_2D);
gl::disable(GL_COLOR_MATERIAL); // disable color tracking