diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-16 21:22:08 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-16 21:22:08 +0000 |
| commit | 604d6fee79a94bd2a54078e1e4d3e70a1bfe56d4 (patch) | |
| tree | fdb07aeaa47f21becc5a643672a931c652e86a65 /src | |
| parent | Update to trunk (diff) | |
| download | inkscape-604d6fee79a94bd2a54078e1e4d3e70a1bfe56d4.tar.gz inkscape-604d6fee79a94bd2a54078e1e4d3e70a1bfe56d4.zip | |
fix error su_v tell to me
(bzr r12588.1.27)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/tools/freehand-base.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index 6e3a04b59..510dfcf4d 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -240,7 +240,7 @@ static void spdc_apply_powerstroke_shape(const std::vector<Geom::Point> & points lpe->getRepr()->setAttribute("interpolator_beta", "0.2"); } -<<<<<<< TREE + static void spdc_apply_bend_shape(gchar const *svgd, SPDrawContext *dc, SPItem *item) { using namespace Inkscape::LivePathEffect; @@ -256,10 +256,8 @@ static void spdc_apply_bend_shape(gchar const *svgd, SPDrawContext *dc, SPItem * } static bool bend; -static void spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item, SPCurve *curve) -======= static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, SPCurve *curve) ->>>>>>> MERGE-SOURCE + { using namespace Inkscape::LivePathEffect; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); |