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

PathGui: fixed potential crash on Path object delete

Browse Source
This commit is contained in:
Zheng, Lei
2017-03-22 03:28:12 +08:00
committed by wmayer
parent aad8ca4dd9
commit 08cf906218
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Mod/Path/Gui/ViewProviderPath.cpp
View File

@@ -258,20 +258,25 @@ SoDetail* ViewProviderPath::getDetail(const char* subelement) const
}
void ViewProviderPath::onSelectionChanged(const Gui::SelectionChanges& msg) {
if(msg.Type == Gui::SelectionChanges::SetPreselect &&
msg.pSubName && pt0Index >= 0 &&
strcmp(msg.pDocName,getObject()->getDocument()->getName())==0 &&
strcmp(msg.pObjectName,getObject()->getNameInDocument())==0)
{
Path::Feature* pcPathObj = static_cast<Path::Feature*>(pcObject);
Base::Vector3d pt = pcPathObj->Placement.getValue().inverse().toMatrix()*
Base::Vector3d(msg.x,msg.y,msg.z);
const SbVec3f &ptTo = *pcLineCoords->point.getValues(pt0Index);
SbVec3f ptFrom(pt.x,pt.y,pt.z);
if(ptFrom != ptTo) {
pcArrowTransform->pointAt(ptFrom,ptTo);
pcArrowSwitch->whichChild = 0;
return;
if(msg.Type == Gui::SelectionChanges::SetPreselect && msg.pSubName &&
pt0Index >= 0 && getObject() && getObject()->getDocument())
{
const char *docName = getObject()->getDocument()->getName();
const char *objName = getObject()->getNameInDocument();
if(docName && objName &&
strcmp(msg.pDocName,docName)==0 &&
strcmp(msg.pObjectName,objName)==0)
{
Path::Feature* pcPathObj = static_cast<Path::Feature*>(pcObject);
Base::Vector3d pt = pcPathObj->Placement.getValue().inverse().toMatrix()*
Base::Vector3d(msg.x,msg.y,msg.z);
const SbVec3f &ptTo = *pcLineCoords->point.getValues(pt0Index);
SbVec3f ptFrom(pt.x,pt.y,pt.z);
if(ptFrom != ptTo) {
pcArrowTransform->pointAt(ptFrom,ptTo);
pcArrowSwitch->whichChild = 0;
return;
}
}
}
pcArrowSwitch->whichChild = -1;