diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-22 19:48:17 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-22 19:48:17 +0000 |
| commit | c577e33f19db82f4bf0aa6436ee95ba80298f51a (patch) | |
| tree | 1e2f33750081e1363ace511e8432aa225b672872 /src | |
| parent | Update to trunk (diff) | |
| parent | Fix bug#1635442 (diff) | |
| download | inkscape-c577e33f19db82f4bf0aa6436ee95ba80298f51a.tar.gz inkscape-c577e33f19db82f4bf0aa6436ee95ba80298f51a.zip | |
Update to trunk
(bzr r15142.1.19)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/live_effects/lpe-copy_rotate.cpp | 2 | ||||
| -rw-r--r-- | src/sp-gradient.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/aboutbox.cpp | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5eaac4b51..fa4d73b70 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -500,7 +500,6 @@ endif() add_executable(inkscape ${main_SRC}) add_executable(inkview ${view_SRC}) -add_dependencies(inkscape inkscape_version) set(INKSCAPE_TARGET_LIBS @@ -526,6 +525,8 @@ set(INKSCAPE_TARGET_LIBS # Build everything except main and inkview.c in a shared library. add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC}) +add_dependencies(inkscape_base inkscape_version) + if(WITH_DBUS) add_dependencies(inkscape_base inkscape_dbus) endif() diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index f28ab4b31..1133e083a 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -58,7 +58,7 @@ pointInTriangle(Geom::Point const &p, Geom::Point const &p1, Geom::Point const & LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : Effect(lpeobject), - origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), + origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this), starting_angle(_("Starting:"), _("Angle of the first copy"), "starting_angle", &wr, this, 0.0), rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 60.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 6), diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp index 49f117a51..746c7fa41 100644 --- a/src/sp-gradient.cpp +++ b/src/sp-gradient.cpp @@ -127,7 +127,7 @@ bool SPGradient::isEquivalent(SPGradient *that) bool effective = true; while (effective && (as && bs)) { if (!as->getEffectiveColor().isClose(bs->getEffectiveColor(), 0.001) || - as->offset != bs->offset) { + as->offset != bs->offset || as->opacity != bs->opacity ) { effective = false; break; } diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 846f00d8a..552500fe8 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -549,6 +549,8 @@ void AboutBox::initStrings() { "Luca Bruno <luca.br@uno.it>, 2005.\n" "Lucas Vieites Fariña<lucas@codexion.com>, 2003-2013.\n" "Mahesh subedi <submanesh@hotmail.com>, 2006.\n" +"Marcin Floryan <marcin.floryan+inkscape (at) gmail.com>, 2016.\n" +"Maren Hachmann <marenhachmann@yahoo.com>, 2015-2016.\n" "Martin Srebotnjak, <miles@filmsi.net>, 2005, 2010.\n" "Masatake YAMATO <jet@gyve.org>, 2002.\n" "Masato Hashimoto <cabezon.hashimoto@gmail.com>, 2009-2014.\n" |