Set merge from trunk

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

diff --git a/src/spray-context.h b/src/spray-context.h
index f8822ce39551506122e2d5438e247a9d3eb8d202..b559fa5936a451ff020abdde004d2ba4a6f8ef6f 100644 (file)
--- a/src/spray-context.h
+++ b/src/spray-context.h
@@ -71,12 +71,10 @@ struct SPSprayContext
     double width;
     double ratio;
     double tilt;
-    double rot_min;
-    double rot_max;
+    double rotation_variation;
     double force;
     double population;
-    double scale_min;
-    double scale_max;
+    double scale_variation;
     double scale;
     double mean;
     double standard_deviation;
@@ -121,5 +119,5 @@ GtkType sp_spray_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 :