diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-04-02 23:48:22 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-04-02 23:48:22 +0000 |
| commit | 046df19875167382bec08d0b531225c77d81395d (patch) | |
| tree | aae02feec9e498adaf2bbf532a257af0316b855a /src | |
| parent | Adding suport for duplicate nodes (diff) | |
| parent | inicialice a header variable (diff) | |
| download | inkscape-046df19875167382bec08d0b531225c77d81395d.tar.gz inkscape-046df19875167382bec08d0b531225c77d81395d.zip | |
update to trunk
(bzr r13645.1.71)
Diffstat (limited to 'src')
| -rw-r--r-- | src/livarot/ShapeMisc.cpp | 8 | ||||
| -rw-r--r-- | src/ui/tool/path-manipulator.cpp | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp index c0bfe9428..4f63007e7 100644 --- a/src/livarot/ShapeMisc.cpp +++ b/src/livarot/ShapeMisc.cpp @@ -371,9 +371,9 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int /*wildPath* int searchInd = 0; int lastPtUsed = 0; + int parentContour=-1; do { - int parentContour=-1; int childEdge = -1; bool foundChild = false; int startBord = -1; @@ -389,8 +389,10 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int /*wildPath* if (askTo < 0 || askTo >= numberOfEdges() ) { parentContour=-1; } else { - parentContour = GPOINTER_TO_INT(swdData[askTo].misc); - parentContour-=1; // pour compenser le decalage + if (getEdge(askTo).prevS >= 0) { + parentContour = GPOINTER_TO_INT(swdData[askTo].misc); + parentContour-=1; // pour compenser le decalage + } childEdge = getPoint(fi).incidentEdge[FIRST]; } } diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index ccf75dcde..dbae69f2c 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -124,6 +124,7 @@ PathManipulator::PathManipulator(MultiPathManipulator &mpm, SPPath *path, , _show_path_direction(false) , _live_outline(true) , _live_objects(true) + , _is_bspline(false) , _lpe_key(lpe_key) { if (_lpe_key.empty()) { |