diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-03-04 09:50:11 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-03-04 09:50:11 -0800 |
| commit | 552267f1c9e95a9b10f03421aa8a37a1048c661c (patch) | |
| tree | 07087447a64088578b15e33d235f9aa945eafc95 /indra/newview/pipeline.cpp | |
| parent | 45a541d2d5ccff4279441c715d3f80890e71beb9 (diff) | |
Fix unused local var 'partition' and avoid assert in rendering highlights.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 4bebf39dbc..fe14d254b4 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -9962,6 +9962,16 @@ bool LLPipeline::getVisiblePointCloud(LLCamera& camera, LLVector3& min, LLVector void LLPipeline::renderHighlight(const LLViewerObject* obj, F32 fade) { + BOOL shaders = canUseVertexShaders(); + if(shaders) + { + gHighlightProgram.bind(); + } + else + { + gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); + } + if (obj && obj->getVolume()) { for (LLViewerObject::child_list_t::const_iterator iter = obj->getChildren().begin(); iter != obj->getChildren().end(); ++iter) |