aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash after uniting three pieces in sequence.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2019-12-29 13:49:57 +02:00
parent fa58a53aed
commit 0b5d066b63
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -33,6 +33,7 @@
- [#978] Don't show errors in History dialog. - [#978] Don't show errors in History dialog.
- Fixed translation numbers in scientific notation. - Fixed translation numbers in scientific notation.
- Fix dialog for tool Point along perpendicular. No memory of line color settings. - Fix dialog for tool Point along perpendicular. No memory of line color settings.
- Fix crash after uniting three pieces in sequence.
# Version 0.6.1 October 23, 2018 # Version 0.6.1 October 23, 2018
- [#885] Regression. Broken support for multi size measurements. - [#885] Regression. Broken support for multi size measurements.

5
src/libs/vtools/tools/vtooluniondetails.cpp
View File

@ -413,6 +413,7 @@ quint32 AddNodePoint(const VPieceNode &node, const VToolUnionDetailsInitData &in
const quint32 idObject = initData.data->AddGObject(point.take()); const quint32 idObject = initData.data->AddGObject(point.take());
children.append(idObject); children.append(idObject);
point1->setIdObject(idObject);
point1->setMode(Draw::Modeling); point1->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(point1.take()); const quint32 id = initData.data->AddGObject(point1.take());
@ -540,6 +541,7 @@ quint32 AddNodeArc(const VPieceNode &node, const VToolUnionDetailsInitData &init
const quint32 idObject = initData.data->AddGObject(arc1.take()); const quint32 idObject = initData.data->AddGObject(arc1.take());
children.append(idObject); children.append(idObject);
arc2->setIdObject(idObject);
arc2->setMode(Draw::Modeling); arc2->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(arc2.take()); const quint32 id = initData.data->AddGObject(arc2.take());
@ -593,6 +595,7 @@ quint32 AddNodeElArc(const VPieceNode &node, const VToolUnionDetailsInitData &in
const quint32 idObject = initData.data->AddGObject(arc1.take()); const quint32 idObject = initData.data->AddGObject(arc1.take());
children.append(idObject); children.append(idObject);
arc2->setIdObject(idObject);
arc2->setMode(Draw::Modeling); arc2->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(arc2.take()); const quint32 id = initData.data->AddGObject(arc2.take());
@ -638,6 +641,7 @@ quint32 AddNodeSpline(const VPieceNode &node, const VToolUnionDetailsInitData &i
children.append(idObject); children.append(idObject);
VSpline *spl1 = new VSpline(*spl); VSpline *spl1 = new VSpline(*spl);
spl1->setIdObject(idObject);
spl1->setMode(Draw::Modeling); spl1->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(spl1); const quint32 id = initData.data->AddGObject(spl1);
@ -711,6 +715,7 @@ quint32 AddNodeSplinePath(const VPieceNode &node, const VToolUnionDetailsInitDat
const quint32 idObject = initData.data->AddGObject(path.take()); const quint32 idObject = initData.data->AddGObject(path.take());
children.append(idObject); children.append(idObject);
path1->setIdObject(idObject);
path1->setMode(Draw::Modeling); path1->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(path1.take()); const quint32 id = initData.data->AddGObject(path1.take());