diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2014-02-05 11:29:11 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2014-02-05 11:29:11 +0000 |
| commit | c7731033ef400fccb6a49d830ded86068fcd3432 (patch) | |
| tree | f3858438132a3f17071321ef91ddfac5e3c6b0ba /src/livarot/PathCutting.cpp | |
| parent | Workaround for Bug #1273510 (crash in in cc_generic_knot_handler() after tool... (diff) | |
| download | inkscape-c7731033ef400fccb6a49d830ded86068fcd3432.tar.gz inkscape-c7731033ef400fccb6a49d830ded86068fcd3432.zip | |
Fix for Bug #1250685 (Unnecessary gender-specific terms in code).
Fixed bugs:
- https://launchpad.net/bugs/1250685
(bzr r12997)
Diffstat (limited to 'src/livarot/PathCutting.cpp')
| -rw-r--r-- | src/livarot/PathCutting.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp index 201f64b54..0dc7ede50 100644 --- a/src/livarot/PathCutting.cpp +++ b/src/livarot/PathCutting.cpp @@ -641,21 +641,21 @@ Path** Path::SubPathsWithNesting(int &outNb,bool killNoSurf,int nbNest,int* } curAdd=NULL; } - Path* hasDad=NULL; + Path* hasParent=NULL; for (int j=0;j<nbNest;j++) { if ( conts[j] == i && nesting[j] >= 0 ) { - int dadMvt=conts[nesting[j]]; + int parentMvt=conts[nesting[j]]; for (int k=0;k<nbRes;k++) { - if ( res[k] && res[k]->descr_cmd.empty() == false && res[k]->descr_cmd[0]->associated == dadMvt ) { - hasDad=res[k]; + if ( res[k] && res[k]->descr_cmd.empty() == false && res[k]->descr_cmd[0]->associated == parentMvt ) { + hasParent=res[k]; break; } } } if ( conts[j] > i ) break; } - if ( hasDad ) { - curAdd=hasDad; + if ( hasParent ) { + curAdd=hasParent; increment=true; } else { curAdd=new Path; |