renaming some brushes

svn://svn.gna.org/svn/mypaint/trunk@273

diff --git a/brushes/blendpaint.myb b/brushes/blend+paint.myb
similarity index 92%
rename from brushes/blendpaint.myb
rename to brushes/blend+paint.myb
index 93110f9..1a0d783 100644 (file)
--- a/brushes/blendpaint.myb
+++ b/brushes/blend+paint.myb
@@ -20,9 +20,9 @@ offset_by_speed_slowness 1.0
 slow_tracking 0.0
 slow_tracking_per_dab 0.0
 tracking_noise 0.0
-color_h 0.616992073039
-color_s 0.326880614621
-color_v 0.504478522927
+color_h 0.0
+color_s 0.0
+color_v 0.0
 change_color_h 0.0
 change_color_l 0.0
 change_color_hsl_s 0.0

diff --git a/brushes/blend+paint_prev.png b/brushes/blend+paint_prev.png
new file mode 100644 (file)
index 0000000..8600a6f
Binary files /dev/null and b/brushes/blend+paint_prev.png differ

diff --git a/brushes/blendpaint_prev.png b/brushes/blendpaint_prev.png
deleted file mode 100644 (file)
index 8458c78..0000000
Binary files a/brushes/blendpaint_prev.png and /dev/null differ

diff --git a/brushes/o505.myb b/brushes/charcoal2.myb
similarity index 100%
rename from brushes/o505.myb
rename to brushes/charcoal2.myb

diff --git a/brushes/o505_prev.png b/brushes/charcoal2_prev.png
similarity index 100%
rename from brushes/o505_prev.png
rename to brushes/charcoal2_prev.png

diff --git a/brushes/s001.myb b/brushes/coarse_bulk_1.myb
similarity index 100%
rename from brushes/s001.myb
rename to brushes/coarse_bulk_1.myb

diff --git a/brushes/s001_prev.png b/brushes/coarse_bulk_1_prev.png
similarity index 100%
rename from brushes/s001_prev.png
rename to brushes/coarse_bulk_1_prev.png

diff --git a/brushes/old_b024.myb b/brushes/coarse_bulk_2.myb
similarity index 100%
rename from brushes/old_b024.myb
rename to brushes/coarse_bulk_2.myb

diff --git a/brushes/old_b024_prev.png b/brushes/coarse_bulk_2_prev.png
similarity index 100%
rename from brushes/old_b024_prev.png
rename to brushes/coarse_bulk_2_prev.png

diff --git a/brushes/ab029.myb b/brushes/coarse_bulk_3.myb
similarity index 100%
rename from brushes/ab029.myb
rename to brushes/coarse_bulk_3.myb

diff --git a/brushes/ab029_prev.png b/brushes/coarse_bulk_3_prev.png
similarity index 100%
rename from brushes/ab029_prev.png
rename to brushes/coarse_bulk_3_prev.png

diff --git a/brushes/o006.myb b/brushes/coarse_bulk_4.myb
similarity index 100%
rename from brushes/o006.myb
rename to brushes/coarse_bulk_4.myb

diff --git a/brushes/o006_prev.png b/brushes/coarse_bulk_4_prev.png
similarity index 100%
rename from brushes/o006_prev.png
rename to brushes/coarse_bulk_4_prev.png

diff --git a/brushes/s005.myb b/brushes/glow.myb
similarity index 99%
rename from brushes/s005.myb
rename to brushes/glow.myb
index 0022390..5f91e49 100644 (file)
--- a/brushes/s005.myb
+++ b/brushes/glow.myb
@@ -30,6 +30,7 @@ change_color_v 0.0
 change_color_hsv_s 0.0
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 4.0
 stroke_holdtime 0.0

diff --git a/brushes/s005_prev.png b/brushes/glow_prev.png
similarity index 100%
rename from brushes/s005_prev.png
rename to brushes/glow_prev.png

diff --git a/brushes/s012.myb b/brushes/goghish_big.myb
similarity index 97%
rename from brushes/s012.myb
rename to brushes/goghish_big.myb
index fc4182e..79e2c5e 100644 (file)
--- a/brushes/s012.myb
+++ b/brushes/goghish_big.myb
@@ -22,7 +22,7 @@ slow_tracking_per_dab 0.0
 tracking_noise 0.0
 color_h 0.0
 color_s 0.0
-color_v 0.00262455176623
+color_v 0.0
 change_color_h 0.0
 change_color_l 0.0
 change_color_hsl_s 0.0
@@ -30,9 +30,9 @@ change_color_v 0.0
 change_color_hsv_s 0.0
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 4.0
 stroke_holdtime 0.0
 custom_input 0.0
 custom_input_slowness 0.0
-

diff --git a/brushes/s012_prev.png b/brushes/goghish_big_prev.png
similarity index 100%
rename from brushes/s012_prev.png
rename to brushes/goghish_big_prev.png

diff --git a/brushes/s009.myb b/brushes/goghish_small.myb
similarity index 97%
rename from brushes/s009.myb
rename to brushes/goghish_small.myb
index a283d70..d72d5d1 100644 (file)
--- a/brushes/s009.myb
+++ b/brushes/goghish_small.myb
@@ -22,7 +22,7 @@ slow_tracking_per_dab 0.0
 tracking_noise 0.0
 color_h 0.0
 color_s 0.0
-color_v 0.00262455176623
+color_v 0.0
 change_color_h 0.0
 change_color_l 0.0
 change_color_hsl_s 0.0
@@ -30,9 +30,9 @@ change_color_v 0.0
 change_color_hsv_s 0.0
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 4.0
 stroke_holdtime 0.0
 custom_input 0.0
 custom_input_slowness 0.0
-

diff --git a/brushes/s009_prev.png b/brushes/goghish_small_prev.png
similarity index 100%
rename from brushes/s009_prev.png
rename to brushes/goghish_small_prev.png

diff --git a/brushes/s006.myb b/brushes/hair.myb
similarity index 90%
rename from brushes/s006.myb
rename to brushes/hair.myb
index 725bc25..11b5f7c 100644 (file)
--- a/brushes/s006.myb
+++ b/brushes/hair.myb
@@ -24,9 +24,13 @@ color_h 0.0
 color_s 0.0
 color_v 0.0
 change_color_h 0.0
-change_color_s 0.0
+change_color_l 0.0
+change_color_hsl_s 0.0
 change_color_v 0.0 | stroke (0.000000 0.000000), (0.246914 0.100000), (0.753086 -0.100000), (1.000000 0.000000)
-adapt_color_from_image 0.0
+change_color_hsv_s 0.0
+smudge 0.0
+smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 7.0
 stroke_holdtime 0.0

diff --git a/brushes/s006_prev.png b/brushes/hair_prev.png
similarity index 100%
rename from brushes/s006_prev.png
rename to brushes/hair_prev.png

diff --git a/brushes/s013.myb b/brushes/hard_sting.myb
similarity index 99%
rename from brushes/s013.myb
rename to brushes/hard_sting.myb
index 0679d7c..8243f21 100644 (file)
--- a/brushes/s013.myb
+++ b/brushes/hard_sting.myb
@@ -30,6 +30,7 @@ change_color_v 0.0
 change_color_hsv_s 0.0
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 2.86
 stroke_holdtime 10.0

diff --git a/brushes/s013_prev.png b/brushes/hard_sting_prev.png
similarity index 100%
rename from brushes/s013_prev.png
rename to brushes/hard_sting_prev.png

diff --git a/brushes/ab020.myb b/brushes/hue_fun.myb
similarity index 93%
rename from brushes/ab020.myb
rename to brushes/hue_fun.myb
index 438c916..30eb4a2 100644 (file)
--- a/brushes/ab020.myb
+++ b/brushes/hue_fun.myb
@@ -20,9 +20,9 @@ offset_by_speed_slowness 1.0
 slow_tracking 0.0
 slow_tracking_per_dab 0.0
 tracking_noise 0.0
-color_h 0.00794839638635
-color_s 0.656092153681
-color_v 0.667627985046
+color_h 0.0
+color_s 0.0
+color_v 0.0
 change_color_h 0.0 | pressure (0.000000 0.000000), (1.000000 -0.389333) | speed1 (0.000000 0.000000), (1.000000 0.668444) | speed2 (0.000000 0.000000), (1.000000 -0.680889)
 change_color_l 0.0
 change_color_hsl_s 0.0
@@ -30,6 +30,7 @@ change_color_v 0.0
 change_color_hsv_s 0.0
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 4.0
 stroke_holdtime 0.0

diff --git a/brushes/ab020_prev.png b/brushes/hue_fun_prev.png
similarity index 100%
rename from brushes/ab020_prev.png
rename to brushes/hue_fun_prev.png

diff --git a/brushes/o665.myb b/brushes/leaves.myb
similarity index 95%
rename from brushes/o665.myb
rename to brushes/leaves.myb
index c8c80df..bd42a6e 100644 (file)
--- a/brushes/o665.myb
+++ b/brushes/leaves.myb
@@ -20,9 +20,9 @@ offset_by_speed_slowness 1.0
 slow_tracking 0.0
 slow_tracking_per_dab 0.0
 tracking_noise 0.0
-color_h 0.141002985802
-color_s 0.616074780389
-color_v 0.406469825284
+color_h 0.0
+color_s 0.0
+color_v 0.0
 change_color_h 0.0 | speed1 (0.000000 -0.000000), (1.000000 -0.120000) | stroke (0.000000 0.000000), (0.651235 -0.007889), (0.706790 0.115704), (0.891975 0.101241), (1.000000 -0.000000)
 change_color_l 0.0
 change_color_hsl_s 0.0
@@ -30,6 +30,7 @@ change_color_v 0.195 | pressure (0.000000 0.000000), (1.000000 -0.570000) | rand
 change_color_hsv_s 0.0 | stroke (0.000000 0.000000), (1.000000 1.690000)
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 2.76
 stroke_holdtime 10.0

diff --git a/brushes/o665_prev.png b/brushes/leaves_prev.png
similarity index 100%
rename from brushes/o665_prev.png
rename to brushes/leaves_prev.png

diff --git a/brushes/s024.myb b/brushes/modelling.myb
similarity index 94%
rename from brushes/s024.myb
rename to brushes/modelling.myb
index 9863f63..51423ed 100644 (file)
--- a/brushes/s024.myb
+++ b/brushes/modelling.myb
@@ -20,9 +20,9 @@ offset_by_speed_slowness 1.0
 slow_tracking 0.0
 slow_tracking_per_dab 0.0
 tracking_noise 0.0
-color_h 0.157186544343
-color_s 0.072924332642
-color_v 0.22807660029
+color_h 0
+color_s 0
+color_v 0
 change_color_h 0.0
 change_color_l 0.0
 change_color_hsl_s 0.0

diff --git a/brushes/s024_prev.png b/brushes/modelling_prev.png
similarity index 100%
rename from brushes/s024_prev.png
rename to brushes/modelling_prev.png

diff --git a/brushes/o007.myb b/brushes/o007.myb
deleted file mode 100644 (file)
index 09b1680..0000000
--- a/brushes/o007.myb
+++ /dev/null
@@ -1,34 +0,0 @@
-# mypaint brush file
-# you can edit this file and then select the brush in mypaint (again) to reload
-version 2
-opaque 1.0
-opaque_multiply 0.0 | pressure (0.000000 0.000000), (0.002778 0.000000), (0.003571 1.000000), (0.150000 1.000000)
-opaque_linearize 0.0
-radius_logarithmic -0.59 | pressure (0.000000 0.000000), (1.000000 -0.870000) | speed2 (0.000000 -0.345000), (0.247619 -0.285000), (0.502976 0.000000), (0.718210 0.570000), (0.954938 1.185000), (1.300000 1.440000)
-hardness 0.69
-dabs_per_basic_radius 0.0
-dabs_per_actual_radius 2.0
-dabs_per_second 20.0
-radius_by_random 0.0
-speed1_slowness 0.19 | pressure (0.000000 0.000000), (1.000000 -0.140000) | speed1 (0.000000 0.000000), (1.000000 -0.040000)
-speed2_slowness 1.01
-speed1_gamma 4.0
-speed2_gamma 4.0
-offset_by_random 0.0
-offset_by_speed 0.0
-offset_by_speed_slowness 1.0
-slow_tracking 0.0
-slow_tracking_per_dab 0.0
-tracking_noise 0.0
-color_h 0.0
-color_s 0.0
-color_v 0.0
-change_color_h 0.0
-change_color_s 0.0
-change_color_v 0.0
-adapt_color_from_image 0.0
-stroke_treshold 0.0
-stroke_duration_logarithmic 4.0
-stroke_holdtime 0.0
-custom_input 0.0
-custom_input_slowness 0.0

diff --git a/brushes/o007_prev.png b/brushes/o007_prev.png
deleted file mode 100644 (file)
index 94665b5..0000000
Binary files a/brushes/o007_prev.png and /dev/null differ

diff --git a/brushes/order.conf b/brushes/order.conf
index 3ec1971..666c1ea 100644 (file)
--- a/brushes/order.conf
+++ b/brushes/order.conf
@@ -1,16 +1,16 @@
 # this file saves brushorder
 # the first one (upper left) will be selected at startup
-s024
-s010
+modelling
+redbrush
 dry_brush
 charcoal
-o505
+charcoal2
 bi006
-blendpaint
+blend+paint
 o594
 s003
 ink
-s017
+textured_ink
 pencil
 blur
 smudge
@@ -20,10 +20,9 @@ bulk
 s000
 s018
 o011
-s006
+hair
 s014
-o007
-s005
+glow
 bi003
 s015
 s011
@@ -39,14 +38,15 @@ o031
 o022
 o014
 o945
+pointy_ink
 s008
 o398
 o512
 s109
-s009
-s012
+goghish_small
+goghish_big
 bi000
-o665
+leaves
 basic
 o009
 o020
@@ -54,24 +54,23 @@ o001
 o032
 o028
 o017
-s001
-old_b024
-ab029
-o006
+coarse_bulk_1
+coarse_bulk_2
+coarse_bulk_3
+coarse_bulk_4
 loosedots
 bigcharcoal
 old_b008
-o748
 o397
 o888
-o312
-s013
+soft_sting
+hard_sting
 o826
 o300
 ab043
 ab033
 ab026
-ab020
+hue_fun
 ab023
 o558
 o834
@@ -81,6 +80,6 @@ ab007
 ab011
 o388
 ab002
-aold_b003
+slow
 ab001
 aold_b004

diff --git a/brushes/o748.myb b/brushes/pointy_ink.myb
similarity index 99%
rename from brushes/o748.myb
rename to brushes/pointy_ink.myb
index 4d7c1ce..492c0fb 100644 (file)
--- a/brushes/o748.myb
+++ b/brushes/pointy_ink.myb
@@ -30,6 +30,7 @@ change_color_v 0.0
 change_color_hsv_s 0.0
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 1.18
 stroke_holdtime 10.0

diff --git a/brushes/o748_prev.png b/brushes/pointy_ink_prev.png
similarity index 100%
rename from brushes/o748_prev.png
rename to brushes/pointy_ink_prev.png

diff --git a/brushes/s010.myb b/brushes/redbrush.myb
similarity index 100%
rename from brushes/s010.myb
rename to brushes/redbrush.myb

diff --git a/brushes/s010_prev.png b/brushes/redbrush_prev.png
similarity index 100%
rename from brushes/s010_prev.png
rename to brushes/redbrush_prev.png

diff --git a/brushes/aold_b003.myb b/brushes/slow.myb
similarity index 96%
rename from brushes/aold_b003.myb
rename to brushes/slow.myb
index da2d800..dddd46a 100644 (file)
--- a/brushes/aold_b003.myb
+++ b/brushes/slow.myb
@@ -17,7 +17,7 @@ speed2_gamma 4.0
 offset_by_random 0.0
 offset_by_speed 0.0
 offset_by_speed_slowness 1.0
-slow_tracking 0.0
+slow_tracking 10.0
 slow_tracking_per_dab 10.0
 tracking_noise 0.0
 color_h 0.0
@@ -30,6 +30,7 @@ change_color_v 0.0
 change_color_hsv_s 0.0
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 4.0
 stroke_holdtime 0.0

diff --git a/brushes/aold_b003_prev.png b/brushes/slow_prev.png
similarity index 100%
rename from brushes/aold_b003_prev.png
rename to brushes/slow_prev.png

diff --git a/brushes/o312.myb b/brushes/soft_sting.myb
similarity index 98%
rename from brushes/o312.myb
rename to brushes/soft_sting.myb
index 55125ff..4d3bb2f 100644 (file)
--- a/brushes/o312.myb
+++ b/brushes/soft_sting.myb
@@ -30,6 +30,7 @@ change_color_v 0.0
 change_color_hsv_s 0.0
 smudge 0.0
 smudge_length 0.5
+eraser 0.0
 stroke_treshold 0.0
 stroke_duration_logarithmic 2.76
 stroke_holdtime 10.0

diff --git a/brushes/o312_prev.png b/brushes/soft_sting_prev.png
similarity index 100%
rename from brushes/o312_prev.png
rename to brushes/soft_sting_prev.png

diff --git a/brushes/s017.myb b/brushes/textured_ink.myb
similarity index 100%
rename from brushes/s017.myb
rename to brushes/textured_ink.myb

diff --git a/brushes/s017_prev.png b/brushes/textured_ink_prev.png
similarity index 100%
rename from brushes/s017_prev.png
rename to brushes/textured_ink_prev.png