Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYevgeny Makarov <jenkm>2021-02-23 13:37:12 +0300
committerJulian Eisel <julian@blender.org>2021-02-23 14:07:25 +0300
commit420f538fadfdd7f9713db9aea44cd7829cbc2ef4 (patch)
tree78f6298e5dcdcb151940e10a06a4d5b4c3d46efe /release/datafiles
parentaa4882506c9acb5483b506c5e1d1569ca8cf5dd3 (diff)
Fix T84707: Wrong icon for Movie Clip Editor
Sync the list of icons in CMakeLists.txt with UI_icons.h. Restore, in the source file, the FUND icon that was accidentally deleted. Delete four old/unused icons. See also D9715.
Diffstat (limited to 'release/datafiles')
-rw-r--r--release/datafiles/blender_icons.svg1
-rw-r--r--release/datafiles/blender_icons16/icon16_brush_blob.datbin1048 -> 0 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_clip.datbin1048 -> 0 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_force_boid.datbin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_sculpt_dyntopo.datbin1048 -> 0 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_sealed.datbin1048 -> 0 bytes
-rw-r--r--release/datafiles/blender_icons16/icon16_temp.datbin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_axis_front.datbin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_brush_blob.datbin4120 -> 0 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_clip.datbin4120 -> 0 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_force_boid.datbin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_mod_offset.datbin4120 -> 4120 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_sculpt_dyntopo.datbin4120 -> 0 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_sealed.datbin4120 -> 0 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_temp.datbin4120 -> 4120 bytes
m---------release/datafiles/locale0
-rw-r--r--release/datafiles/prvicons.pngbin16045 -> 23983 bytes
17 files changed, 1 insertions, 0 deletions
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 16d50623fa4..6fa54c25de2 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -3209,6 +3209,7 @@
<g id="g6666-5" transform="translate(-63.000002,42.000005)" style="display:inline;opacity:1;fill:#ffffff;enable-background:new" inkscape:export-filename="C:\Users\Andrzej Ambroż\Desktop\mtrx.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96">
<path style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79999995;marker:none;enable-background:accumulate" d="m 363.5,536 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 13 a 0.50005,0.50005 0 0 0 0.5,0.5 h 13 a 0.50005,0.50005 0 0 0 0.5,-0.5 v -13 a 0.50005,0.50005 0 0 0 -0.5,-0.5 z m 0.5,1 h 12 v 12 h -12 z m 2,2 v 1 h 1 v -1 z m 1,1 v 1 h 1 v -1 z m 1,1 v 1 h 1 v -1 z m 0,1 h -1 v 1 h 1 z m -1,1 h -1 v 1 h 1 z m 2,0 v 1 h 3 v -1 z" transform="translate(63.000002,-42.000005)" id="rect40533-7-0" inkscape:connector-curvature="0"/>
</g>
+ <path inkscape:connector-curvature="0" id="path4106" d="m 408.48148,452.0625 c -1.71014,0.0728 -3.32227,1.4838 -3.32227,3.9375 0,2.05278 1.07076,4.01178 2.38672,5.71289 1.31595,1.70111 2.90024,3.15481 4.03125,4.16016 0.0914,0.0816 0.20954,0.12673 0.33203,0.12695 h 0.5 c 0.12249,-2.2e-4 0.24064,-0.0454 0.33203,-0.12695 1.13101,-1.00535 2.7153,-2.45905 4.03125,-4.16016 1.31596,-1.70111 2.38672,-3.66011 2.38672,-5.71289 0,-2.4537 -1.61213,-3.86473 -3.32227,-3.9375 -1.52139,-0.0647 -3.0532,0.927 -3.67773,2.69727 -0.62453,-1.77027 -2.15634,-2.76201 -3.67773,-2.69727 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" sodipodi:nodetypes="csccccccsccc" />
<g transform="matrix(-1,0,0,1,635,-357)" id="g12824" style="fill:#ffffff">
<path inkscape:connector-curvature="0" id="path12813" d="m 363.5,431 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 1 a 0.50005,0.50005 0 0 0 0.14648,0.35352 L 368,437.70703 V 441.5 a 0.50005,0.50005 0 0 0 0.14648,0.35352 l 3,3 A 0.50005,0.50005 0 0 0 372,444.5 v -6.79297 l 4.85352,-4.85351 A 0.50005,0.50005 0 0 0 377,432.5 v -1 a 0.50005,0.50005 0 0 0 -0.5,-0.5 z m 0.5,1 h 12 v 0.29297 l -4.85352,4.85351 A 0.50005,0.50005 0 0 0 371,437.5 v 5.79297 l -2,-2 V 437.5 a 0.50005,0.50005 0 0 0 -0.14648,-0.35352 L 364,432.29297 Z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
</g>
diff --git a/release/datafiles/blender_icons16/icon16_brush_blob.dat b/release/datafiles/blender_icons16/icon16_brush_blob.dat
deleted file mode 100644
index 4f57ce5ef27..00000000000
--- a/release/datafiles/blender_icons16/icon16_brush_blob.dat
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_clip.dat b/release/datafiles/blender_icons16/icon16_clip.dat
deleted file mode 100644
index 75a39fc0bdf..00000000000
--- a/release/datafiles/blender_icons16/icon16_clip.dat
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_force_boid.dat b/release/datafiles/blender_icons16/icon16_force_boid.dat
index 71f89bd7c04..f719054d84a 100644
--- a/release/datafiles/blender_icons16/icon16_force_boid.dat
+++ b/release/datafiles/blender_icons16/icon16_force_boid.dat
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat b/release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat
deleted file mode 100644
index 08fc3aba73c..00000000000
--- a/release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_sealed.dat b/release/datafiles/blender_icons16/icon16_sealed.dat
deleted file mode 100644
index 2c6e3bac48f..00000000000
--- a/release/datafiles/blender_icons16/icon16_sealed.dat
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/blender_icons16/icon16_temp.dat b/release/datafiles/blender_icons16/icon16_temp.dat
index 0c3a0bd5deb..9abd6ac2a0d 100644
--- a/release/datafiles/blender_icons16/icon16_temp.dat
+++ b/release/datafiles/blender_icons16/icon16_temp.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_axis_front.dat b/release/datafiles/blender_icons32/icon32_axis_front.dat
index afcc15da233..ca9a0efd467 100644
--- a/release/datafiles/blender_icons32/icon32_axis_front.dat
+++ b/release/datafiles/blender_icons32/icon32_axis_front.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_brush_blob.dat b/release/datafiles/blender_icons32/icon32_brush_blob.dat
deleted file mode 100644
index 5f43c0e3943..00000000000
--- a/release/datafiles/blender_icons32/icon32_brush_blob.dat
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_clip.dat b/release/datafiles/blender_icons32/icon32_clip.dat
deleted file mode 100644
index 00fec392e77..00000000000
--- a/release/datafiles/blender_icons32/icon32_clip.dat
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_force_boid.dat b/release/datafiles/blender_icons32/icon32_force_boid.dat
index 7fc7cb5ee8c..9043989024b 100644
--- a/release/datafiles/blender_icons32/icon32_force_boid.dat
+++ b/release/datafiles/blender_icons32/icon32_force_boid.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_mod_offset.dat b/release/datafiles/blender_icons32/icon32_mod_offset.dat
index 232c79c0c59..eb767471c25 100644
--- a/release/datafiles/blender_icons32/icon32_mod_offset.dat
+++ b/release/datafiles/blender_icons32/icon32_mod_offset.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat b/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat
deleted file mode 100644
index 41e3c0c4fcc..00000000000
--- a/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_sealed.dat b/release/datafiles/blender_icons32/icon32_sealed.dat
deleted file mode 100644
index 37d48608be2..00000000000
--- a/release/datafiles/blender_icons32/icon32_sealed.dat
+++ /dev/null
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_temp.dat b/release/datafiles/blender_icons32/icon32_temp.dat
index 645206e8560..74f6401712c 100644
--- a/release/datafiles/blender_icons32/icon32_temp.dat
+++ b/release/datafiles/blender_icons32/icon32_temp.dat
Binary files differ
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 6c693b5b0b27468d4fd2d2c47ea023eebbb0dbc
+Subproject aafea2abb18bb42e7d31a6926b2caba90f4e031
diff --git a/release/datafiles/prvicons.png b/release/datafiles/prvicons.png
index 4b7b23aa006..e97e2ae330e 100644
--- a/release/datafiles/prvicons.png
+++ b/release/datafiles/prvicons.png
Binary files differ