removed three brushes, updated some previews

svn://old.homeip.net/code/mypaint@293

diff --git a/brushes/o000.myb b/brushes/o000.myb
index 44c674c..a821870 100644 (file)
--- a/brushes/o000.myb
+++ b/brushes/o000.myb
@@ -21,3 +21,6 @@ color_saturation 0.0
 color_hue 0.0
 adapt_color_from_image 0.0
 change_radius 0.0
+stroke_treshold 0.0
+stroke_duration_logarithmic 4.0
+stroke_holdtime 0.0

diff --git a/brushes/o000_prev.png b/brushes/o000_prev.png
index cc4de0b..e5b335e 100644 (file)
Binary files a/brushes/o000_prev.png and b/brushes/o000_prev.png differ

diff --git a/brushes/o002.myb b/brushes/o002.myb
deleted file mode 100644 (file)
index f3ac198..0000000
--- a/brushes/o002.myb
+++ /dev/null
@@ -1,23 +0,0 @@
-# mypaint brush file
-color 0 0 0
-opaque 0.16
-opaque_multiply 0.0 | pressure 0.243827160494 0.155625 0.614197530864 0.328541666667 1.0 0.83 0.0 0.0
-radius_logarithmic 2.0 | pressure 1.0 -1.95 0.0 0.0 0.0 0.0 0.0 0.0
-hardness 0.81
-dabs_per_basic_radius 0.0
-dabs_per_actual_radius 3.36
-dabs_per_second 0.0
-radius_by_random 0.0
-speed1_slowness 0.04
-speed2_slowness 1.0
-offset_by_random 0.0
-offset_by_speed 0.0
-offset_by_speed_slowness 1.0
-saturation_slowdown 0.0
-slow_tracking 0.0
-slow_tracking_per_dab 0.0
-color_value 0.0
-color_saturation 0.0
-color_hue 0.0
-adapt_color_from_image 0.0
-change_radius 0.0

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

diff --git a/brushes/o011.myb b/brushes/o011.myb
index 8c67031..97c1a22 100644 (file)
--- a/brushes/o011.myb
+++ b/brushes/o011.myb
@@ -1,5 +1,5 @@
 # mypaint brush file
-color 0 0 0
+color 0 8 24
 opaque 0.66
 opaque_multiply 0.0 | pressure 1.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0
 radius_logarithmic -0.5 | pressure 0.438271604938 -0.5 1.0 -3.2 0.0 0.0 0.0 0.0 | random 1.0 1.25 0.0 0.0 0.0 0.0 0.0 0.0
@@ -21,3 +21,6 @@ color_saturation 0.0
 color_hue 0.0
 adapt_color_from_image 0.0
 change_radius 0.0
+stroke_treshold 0.0
+stroke_duration_logarithmic 4.0
+stroke_holdtime 0.0

diff --git a/brushes/o011_prev.png b/brushes/o011_prev.png
index c80a6e5..1e03e5d 100644 (file)
Binary files a/brushes/o011_prev.png and b/brushes/o011_prev.png differ

diff --git a/brushes/o042.myb b/brushes/o042.myb
deleted file mode 100644 (file)
index 0b5e2e8..0000000
--- a/brushes/o042.myb
+++ /dev/null
@@ -1,23 +0,0 @@
-# mypaint brush file
-color 0 0 0
-opaque 0.46
-opaque_multiply 0.0 | pressure 1.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0
-radius_logarithmic 2.12 | pressure 1.0 2.74 0.0 0.0 0.0 0.0 0.0 0.0
-hardness 0.66
-dabs_per_basic_radius 0.0
-dabs_per_actual_radius 2.0
-dabs_per_second 0.0
-radius_by_random 4.62
-speed1_slowness 0.04
-speed2_slowness 0.8
-offset_by_random 0.87
-offset_by_speed 1.06
-offset_by_speed_slowness 1.0
-saturation_slowdown 0.0
-slow_tracking 0.0
-slow_tracking_per_dab 0.0
-color_value 0.0 | random 1.0 0.99 0.0 0.0 0.0 0.0 0.0 0.0
-color_saturation 0.0
-color_hue 0.0
-adapt_color_from_image 0.0
-change_radius 0.0

diff --git a/brushes/o042_prev.png b/brushes/o042_prev.png
deleted file mode 100644 (file)
index 83a977d..0000000
Binary files a/brushes/o042_prev.png and /dev/null differ

diff --git a/brushes/o393.myb b/brushes/o393.myb
deleted file mode 100644 (file)
index d72f8ec..0000000
--- a/brushes/o393.myb
+++ /dev/null
@@ -1,26 +0,0 @@
-# mypaint brush file
-color 16 161 65
-opaque 1.0 | stroke 0.216049382716 0.0 1.0 -0.72 0.0 0.0 0.0 0.0
-opaque_multiply 0.0 | pressure 1.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0
-radius_logarithmic 0.8 | stroke 0.416666666667 0.0 1.0 0.38 0.0 0.0 0.0 0.0
-hardness 1.0 | stroke 0.259259259259 -0.0 1.0 -0.5 0.0 0.0 0.0 0.0
-dabs_per_basic_radius 0.0
-dabs_per_actual_radius 2.0
-dabs_per_second 0.0
-radius_by_random 0.0
-speed1_slowness 0.04
-speed2_slowness 0.8
-offset_by_random 0.0 | stroke 0.413580246914 0.115833333333 0.601851851852 0.448854166667 0.753086419753 1.28864583333 1.0 1.39
-offset_by_speed 0.0
-offset_by_speed_slowness 1.0
-saturation_slowdown 0.0
-slow_tracking 0.0
-slow_tracking_per_dab 0.0
-color_value -1.0 | random 1.0 0.58 0.0 0.0 0.0 0.0 0.0 0.0 | stroke 1.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0
-color_saturation 0.0
-color_hue 0.0
-adapt_color_from_image 0.0
-change_radius 0.0
-stroke_treshold 0.0
-stroke_duration_logarithmic 2.94
-stroke_holdtime 10.0

diff --git a/brushes/o393_prev.png b/brushes/o393_prev.png
deleted file mode 100644 (file)
index 3d1f8e3..0000000
Binary files a/brushes/o393_prev.png and /dev/null differ

diff --git a/brushes/old_b004.myb b/brushes/old_b004.myb
index 5a5c3a3..6f9287c 100644 (file)
--- a/brushes/old_b004.myb
+++ b/brushes/old_b004.myb
@@ -21,3 +21,6 @@ color_saturation 0.0
 color_hue 0.0
 adapt_color_from_image 0.0
 change_radius 0.0
+stroke_treshold 0.0
+stroke_duration_logarithmic 4.0
+stroke_holdtime 0.0

diff --git a/brushes/old_b004_prev.png b/brushes/old_b004_prev.png
index ab05572..3585a60 100644 (file)
Binary files a/brushes/old_b004_prev.png and b/brushes/old_b004_prev.png differ

diff --git a/brushes/order.conf b/brushes/order.conf
index ea6ac3f..afa7953 100644 (file)
--- a/brushes/order.conf
+++ b/brushes/order.conf
@@ -5,30 +5,33 @@ ink
 pencil
 charcoal
 o031
+o000
 o011
-old_b004
 o022
-o039
-o024
 blur
 smudge
-o009
-o020
 o033
-o025
-o015
+o018
+old_b004
 o501
 o512
 o945
-o029
 o665
 o519
 bulk
+o029
+o009
+o020
 old_b008
 o005
 o007
+o001
 basic
+o024
+o039
 o026
+o025
+o015
 o398
 old_b003
 o038
@@ -40,16 +43,10 @@ o036
 o028
 o037
 o017
-o001
-o018
-o000
 o023
-o002
 o019
+o014
 o012
 old_b024
 o006
-o042
 o013
-o014
-o393