Merge from trunk.

[inkscape.git] / src / tweak-context.h

diff --git a/src/tweak-context.h b/src/tweak-context.h
index b5b150de03c692a56d9d846c9bf0c966059e334a..ad688b0256431fd0d40cace694dcfd01c0438190 100644 (file)
--- a/src/tweak-context.h
+++ b/src/tweak-context.h
@@ -43,7 +43,8 @@ enum {
     TWEAK_MODE_ATTRACT_REPEL,
     TWEAK_MODE_ROUGHEN,
     TWEAK_MODE_COLORPAINT,
-    TWEAK_MODE_COLORJITTER
+    TWEAK_MODE_COLORJITTER,
+    TWEAK_MODE_BLUR
 };
 
 struct SPTweakContext
@@ -70,7 +71,7 @@ struct SPTweakContext
 
     bool is_dilating;
     bool has_dilated;
-    NR::Point last_push;
+    Geom::Point last_push;
     SPCanvasItem *dilate_area;
 
     bool do_h;
@@ -99,4 +100,4 @@ GtkType sp_tweak_context_get_type(void);
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :