diff options
author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2018-04-23 18:50:27 +0300 |
---|---|---|
committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2018-04-23 18:50:27 +0300 |
commit | 395ce043c785cac9e933d76bf94ca6359285ebf7 (patch) | |
tree | 930ed3105639ebdb768f5a0fb9bcab3f0d9e0963 /indra/newview | |
parent | 4c0af0891e4e4c7e1894b900cdcc919e9d1d67cf (diff) |
MAINT-8388 [LOVE ME RENDER] Highlighting Changes Make Editing Mesh Objects Difficult
Wire selection mode - while Edit tool is selected
Outline selection mode - for all other case
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 4bf2aa2d0b..ddae109030 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -6346,10 +6346,16 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color) gGL.diffuseColor4f(color.mV[VRED] * 2, color.mV[VGREEN] * 2, color.mV[VBLUE] * 2, LLSelectMgr::sHighlightAlpha * 2); { - LLGLDisable depth(GL_BLEND); - LLGLEnable stencil(GL_STENCIL_TEST); - glStencilFunc(GL_NOTEQUAL, 2, 0xffff); - glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); + bool wireframe_selection = gFloaterTools && gFloaterTools->getVisible(); + + LLGLDisable depth(wireframe_selection ? 0 : GL_BLEND); + LLGLEnable stencil(wireframe_selection ? 0 : GL_STENCIL_TEST); + + if (!wireframe_selection) + { //modify wireframe into outline selection mode + glStencilFunc(GL_NOTEQUAL, 2, 0xffff); + glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); + } LLGLEnable offset(GL_POLYGON_OFFSET_LINE); glPolygonOffset(3.f, 3.f); |