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

System identifies two of the same curve. Closes #171

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-03-14 18:31:31 +02:00
parent 5d22771428
commit e013ce234a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -2,6 +2,7 @@
- Z value change for a layout piece. - Z value change for a layout piece.
- Fix issue with Custom template. - Fix issue with Custom template.
- Fix issue with tile font size. - Fix issue with tile font size.
- [smart-pattern/valentina#171] System identifies two of the same curve.
# Valentina 0.7.50 February 14, 2022 # Valentina 0.7.50 February 14, 2022
- Fix regression. Minimal seam allowance width is less than the point accuracy values. - Fix regression. Minimal seam allowance width is less than the point accuracy values.

3
src/libs/vtools/dialogs/dialogtoolbox.cpp
View File

@ -146,7 +146,8 @@ auto DoubleCurve(const VPieceNode &firstNode, const VPieceNode &secondNode, cons
} }
// The same curve, but different modeling objects // The same curve, but different modeling objects
if (curve1->getIdObject() == curve2->getIdObject()) if (curve1->getIdObject() != NULL_ID && curve2->getIdObject() != NULL_ID &&
curve1->getIdObject() == curve2->getIdObject())
{ {
error = QObject::tr("Leave only one copy of curve '%1'").arg(curve1->name()); error = QObject::tr("Leave only one copy of curve '%1'").arg(curve1->name());
return true; return true;