kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #10418 from wwmayer/fix_cleanup_selection

Browse Source 
Fix possible issues in selection node
This commit is contained in:
Chris Hennes
2023-08-28 22:07:17 -05:00
committed by GitHub
parent 932fd4638b 6eddb195cd
commit 377fe27826
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Gui/SoFCSelectionContext.cpp
View File

@@ -181,12 +181,7 @@ int SoFCSelectionContextEx::merge(int status, SoFCSelectionContextBasePtr &outpu
SoFCSelectionContextBasePtr input, SoNode *node)
{
auto ctx = std::dynamic_pointer_cast<SoFCSelectionContextEx>(input);
SoFCSelectionRoot* selectionNode;
if (node == nullptr) {
selectionNode = nullptr;
} else {
selectionNode = dynamic_cast<SoFCSelectionRoot*>(node);
}
SoFCSelectionRoot* selectionNode = dynamic_cast<SoFCSelectionRoot*>(node);
if(!ctx) {
if(selectionNode && selectionNode->hasColorOverride()) {

9
src/Gui/SoFCUnifiedSelection.cpp
View File

@@ -1124,9 +1124,14 @@ SoFCSelectionContextBasePtr
SoFCSelectionRoot::getNodeContext2(Stack &stack, SoNode *node, SoFCSelectionContextBase::MergeFunc *merge)
{
SoFCSelectionContextBasePtr ret;
auto *back = dynamic_cast<SoFCSelectionRoot*>(stack.back());
if(stack.empty() || back == nullptr || back->contextMap2.empty())
if (stack.empty()) {
return ret;
}
auto *back = dynamic_cast<SoFCSelectionRoot*>(stack.back());
if (back == nullptr || back->contextMap2.empty()) {
return ret;
}
int status = 0;
auto &map = back->contextMap2;