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

Fix crash after uniting three pieces in sequence.

Browse Source 
(grafted from 7f649df048328d449e1de01794d238eeef0c39be)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-12-29 13:49:57 +02:00
parent 9e7cf5c55c
commit 3c74c03c59
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

@ -72,6 +72,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

@ -412,6 +412,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());
@ -539,6 +540,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());
@ -592,6 +594,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());
@ -637,6 +640,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);
@ -710,6 +714,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());