summaryrefslogtreecommitdiffstats
path: root/src/widgets/paint-selector.cpp
diff options
context:
space:
mode:
authorDmitry Zhulanov <dmitry.zhulanov@gmail.com>2016-09-27 14:10:34 +0000
committerDmitry Zhulanov <dmitry.zhulanov@gmail.com>2016-09-27 14:10:34 +0000
commitf74adc97c60950f4cba426e436e00e2401160cf4 (patch)
tree134894d03ca7c5c37196054a39894350d122fd02 /src/widgets/paint-selector.cpp
parentadd x-verbs support (diff)
parentfix tabs in src/main-cmdlineact (diff)
downloadinkscape-f74adc97c60950f4cba426e436e00e2401160cf4.tar.gz
inkscape-f74adc97c60950f4cba426e436e00e2401160cf4.zip
merge with trunk
(bzr r15136.1.2)
Diffstat (limited to 'src/widgets/paint-selector.cpp')
-rw-r--r--src/widgets/paint-selector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 01118f337..ddac90730 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -33,7 +33,7 @@
#include "sp-linear-gradient.h"
#include "sp-radial-gradient.h"
-#include "sp-mesh.h"
+#include "sp-mesh-gradient.h"
#include "sp-stop.h"
/* fixme: Move it from dialogs to here */
#include "gradient-selector.h"
@@ -1221,7 +1221,7 @@ SPPaintSelector::Mode SPPaintSelector::getModeForStyle(SPStyle const & style, Fi
} else if (SP_IS_RADIALGRADIENT(server)) {
mode = MODE_GRADIENT_RADIAL;
#ifdef WITH_MESH
- } else if (SP_IS_MESH(server)) {
+ } else if (SP_IS_MESHGRADIENT(server)) {
mode = MODE_GRADIENT_MESH;
#endif
} else if (SP_IS_PATTERN(server)) {