Part/Gui: Rename Pick Geometry tool to Clarify Selection
Co-authored-by: realthunder <realthunder@users.noreply.github.com>
This commit is contained in:
@@ -90,9 +90,9 @@ void SoBrepEdgeSet::GLRender(SoGLRenderAction *action)
|
||||
|
||||
|
||||
if (Gui::Selection()
|
||||
.isPickGeometryActive() && !Gui::SoDelayedAnnotationsElement::isProcessingDelayedPaths
|
||||
.isClarifySelectionActive() && !Gui::SoDelayedAnnotationsElement::isProcessingDelayedPaths
|
||||
&& ((ctx && !ctx->hl.empty()) || viewProvider->isFaceHighlightActive())) {
|
||||
// if we are using pickgeometry - add this to delayed paths with priority
|
||||
// if we are using clarifyselection - add this to delayed paths with priority
|
||||
// as we want to get this rendered on top of everything
|
||||
viewProvider->setFaceHighlightActive(true);
|
||||
Gui::SoDelayedAnnotationsElement::addDelayedPath(action->getState(),
|
||||
@@ -154,7 +154,7 @@ void SoBrepEdgeSet::GLRender(SoGLRenderAction *action)
|
||||
}
|
||||
if(ctx2 && !ctx2->selectionIndex.empty())
|
||||
renderSelection(action,ctx2,false);
|
||||
else if (Gui::Selection().isPickGeometryActive()
|
||||
else if (Gui::Selection().isClarifySelectionActive()
|
||||
&& ((ctx && !ctx->hl.empty()) || viewProvider->isFaceHighlightActive())
|
||||
&& Gui::SoDelayedAnnotationsElement::isProcessingDelayedPaths) {
|
||||
state->push();
|
||||
|
||||
@@ -533,7 +533,7 @@ void SoBrepFaceSet::GLRender(SoGLRenderAction *action)
|
||||
selCounter.checkRenderCache(state);
|
||||
|
||||
// for the tool add this node to delayed paths as we want to render it on top of the scene
|
||||
if (Gui::Selection().isPickGeometryActive() && ctx && ctx->isHighlighted()
|
||||
if (Gui::Selection().isClarifySelectionActive() && ctx && ctx->isHighlighted()
|
||||
&& !ctx->isHighlightAll() && ctx->highlightIndex >= 0
|
||||
&& ctx->highlightIndex < partIndex.getNum()) {
|
||||
|
||||
|
||||
@@ -84,9 +84,9 @@ void SoBrepPointSet::GLRender(SoGLRenderAction *action)
|
||||
if(selContext2->checkGlobal(ctx))
|
||||
ctx = selContext2;
|
||||
|
||||
// for pickgeometry, add this node to delayed path if it is highlighted and render it on
|
||||
// for clarifyselection, add this node to delayed path if it is highlighted and render it on
|
||||
// top of everything else (highest priority)
|
||||
if (Gui::Selection().isPickGeometryActive() && ctx && ctx->isHighlighted()
|
||||
if (Gui::Selection().isClarifySelectionActive() && ctx && ctx->isHighlighted()
|
||||
&& !ctx->isHighlightAll() && ctx->highlightIndex >= 0
|
||||
&& !Gui::SoDelayedAnnotationsElement::isProcessingDelayedPaths) {
|
||||
viewProvider->setFaceHighlightActive(true);
|
||||
|
||||
Reference in New Issue
Block a user