diff options
author | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
commit | 5d34ac552f3939626840b703b2da380663f25f49 (patch) | |
tree | ddeacd3365fed0ad193c053d39ebeb39451cc74a /indra/newview/llfloaterimagepreview.cpp | |
parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
parent | 8db983fb8095f25873b8317fd1f4764abce4a31b (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llfloaterimagepreview.cpp')
-rw-r--r-- | indra/newview/llfloaterimagepreview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp index 6b2492d927..2575f6f817 100644 --- a/indra/newview/llfloaterimagepreview.cpp +++ b/indra/newview/llfloaterimagepreview.cpp @@ -901,11 +901,13 @@ BOOL LLImagePreviewSculpted::render() { gObjectPreviewProgram.bind(); } + gPipeline.enableLightsPreview(); + gGL.pushMatrix(); const F32 SCALE = 1.25f; gGL.scalef(SCALE, SCALE, SCALE); const F32 BRIGHTNESS = 0.9f; - gGL.color3f(BRIGHTNESS, BRIGHTNESS, BRIGHTNESS); + gGL.diffuseColor3f(BRIGHTNESS, BRIGHTNESS, BRIGHTNESS); mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_TEXCOORD0); mVertexBuffer->draw(LLRender::TRIANGLES, num_indices, 0); |