suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0001790: Crash on undo/redo with a selection

Browse Source
This commit is contained in:
wmayer 2014-12-14 00:06:08 +01:00
parent ff7e33b95d
commit 78f07f8731
1 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@ -1957,22 +1957,29 @@ void ViewProviderSketch::updateColor(void)
//int32_t *index = edit->CurveSet->numVertices.startEditing(); //int32_t *index = edit->CurveSet->numVertices.startEditing();
// colors of the point set // colors of the point set
if (edit->FullyConstrained) if (edit->FullyConstrained) {
for (int i=0; i < PtNum; i++) for (int i=0; i < PtNum; i++)
pcolor[i] = FullyConstrainedColor; pcolor[i] = FullyConstrainedColor;
else }
else {
for (int i=0; i < PtNum; i++) for (int i=0; i < PtNum; i++)
pcolor[i] = VertexColor; pcolor[i] = VertexColor;
}
if (edit->PreselectCross == 0) if (edit->PreselectCross == 0) {
pcolor[0] = PreselectColor; pcolor[0] = PreselectColor;
else if (edit->PreselectPoint != -1) }
else if (edit->PreselectPoint != -1) {
if (edit->PreselectPoint + 1 < PtNum)
pcolor[edit->PreselectPoint + 1] = PreselectColor; pcolor[edit->PreselectPoint + 1] = PreselectColor;
}
for (std::set<int>::iterator it=edit->SelPointSet.begin(); for (std::set<int>::iterator it = edit->SelPointSet.begin(); it != edit->SelPointSet.end(); ++it) {
it != edit->SelPointSet.end(); it++) if (*it < PtNum) {
pcolor[*it] = (*it==(edit->PreselectPoint + 1) && (edit->PreselectPoint != -1))? pcolor[*it] = (*it==(edit->PreselectPoint + 1) && (edit->PreselectPoint != -1))
PreselectSelectedColor:SelectColor; ? PreselectSelectedColor : SelectColor;
}
}
// colors of the curves // colors of the curves
//int intGeoCount = getSketchObject()->getHighestCurveIndex() + 1; //int intGeoCount = getSketchObject()->getHighestCurveIndex() + 1;