[Bf-blender-cvs] [420f538fadf] master: Fix T84707: Wrong icon for Movie Clip Editor
Yevgeny Makarov
noreply at git.blender.org
Tue Feb 23 12:13:45 CET 2021
Commit: 420f538fadfdd7f9713db9aea44cd7829cbc2ef4
Author: Yevgeny Makarov
Date: Tue Feb 23 11:37:12 2021 +0100
Branches: master
https://developer.blender.org/rB420f538fadfdd7f9713db9aea44cd7829cbc2ef4
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.
===================================================================
M release/datafiles/blender_icons.svg
D release/datafiles/blender_icons16/icon16_brush_blob.dat
D release/datafiles/blender_icons16/icon16_clip.dat
M release/datafiles/blender_icons16/icon16_force_boid.dat
D release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat
D release/datafiles/blender_icons16/icon16_sealed.dat
M release/datafiles/blender_icons16/icon16_temp.dat
M release/datafiles/blender_icons32/icon32_axis_front.dat
D release/datafiles/blender_icons32/icon32_brush_blob.dat
D release/datafiles/blender_icons32/icon32_clip.dat
M release/datafiles/blender_icons32/icon32_force_boid.dat
M release/datafiles/blender_icons32/icon32_mod_offset.dat
D release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat
D release/datafiles/blender_icons32/icon32_sealed.dat
M release/datafiles/blender_icons32/icon32_temp.dat
M release/datafiles/locale
M release/datafiles/prvicons.png
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/editors/datafiles/CMakeLists.txt
M source/tools
===================================================================
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 [...]
</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.05 [...]
<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.14 [...]
</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
Binary files a/release/datafiles/blender_icons16/icon16_brush_blob.dat and /dev/null 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
Binary files a/release/datafiles/blender_icons16/icon16_clip.dat and /dev/null 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
Binary files a/release/datafiles/blender_icons16/icon16_force_boid.dat and b/release/datafiles/blender_icons16/icon16_force_boid.dat 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
Binary files a/release/datafiles/blender_icons16/icon16_sculpt_dyntopo.dat and /dev/null 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
Binary files a/release/datafiles/blender_icons16/icon16_sealed.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons16/icon16_temp.dat b/release/datafiles/blender_icons16/icon16_temp.dat
index 0c3a0bd5deb..9abd6ac2a0d 100644
Binary files a/release/datafiles/blender_icons16/icon16_temp.dat and b/release/datafiles/blender_icons16/icon16_temp.dat 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
Binary files a/release/datafiles/blender_icons32/icon32_axis_front.dat and b/release/datafiles/blender_icons32/icon32_axis_front.dat 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
Binary files a/release/datafiles/blender_icons32/icon32_brush_blob.dat and /dev/null 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
Binary files a/release/datafiles/blender_icons32/icon32_clip.dat and /dev/null 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
Binary files a/release/datafiles/blender_icons32/icon32_force_boid.dat and b/release/datafiles/blender_icons32/icon32_force_boid.dat 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
Binary files a/release/datafiles/blender_icons32/icon32_mod_offset.dat and b/release/datafiles/blender_icons32/icon32_mod_offset.dat 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
Binary files a/release/datafiles/blender_icons32/icon32_sculpt_dyntopo.dat and /dev/null 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
Binary files a/release/datafiles/blender_icons32/icon32_sealed.dat and /dev/null differ
diff --git a/release/datafiles/blender_icons32/icon32_temp.dat b/release/datafiles/blender_icons32/icon32_temp.dat
index 645206e8560..74f6401712c 100644
Binary files a/release/datafiles/blender_icons32/icon32_temp.dat and b/release/datafiles/blender_icons32/icon32_temp.dat differ
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 6c693b5b0b2..aafea2abb18 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 6c693b5b0b27468d4fd2d2c47ea023eebbb0dbc0
+Subproject commit aafea2abb18bb42e7d31a6926b2caba90f4e0316
diff --git a/release/datafiles/prvicons.png b/release/datafiles/prvicons.png
index 4b7b23aa006..e97e2ae330e 100644
Binary files a/release/datafiles/prvicons.png and b/release/datafiles/prvicons.png differ
diff --git a/release/scripts/addons b/release/scripts/addons
index f01d08b7c5f..37af7e130b9 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f01d08b7c5f7873e0ce8a77b84788e2f6b1ad716
+Subproject commit 37af7e130b99865575f1fa2315ef806f815b0f42
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index d71985e9019..a140f066ac9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit d71985e901986970dfc86c3d5d1124d0f8c27518
+Subproject commit a140f066ac99e1860af38080f008507029a34706
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index bd37df49e39..4c0d1b65465 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -53,6 +53,9 @@ set(ICON_NAMES
collapsemenu
x
duplicate
+ trash
+ co
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list