Commit: 5f411f7f3870b021161c588fa7ecf66e6c089330 Author: Jeroen Bakker Date: Wed Jan 13 14:31:52 2021 +0100 Branches: master https://developer.blender.org/rB5f411f7f3870b021161c588fa7ecf66e6c089330
Revert "Fix T79356: Improved icons for MSIX builds" This reverts commit 78011d712dc311768a501b31917f2eef27af753b. =================================================================== M release/datafiles/locale M release/scripts/addons A release/windows/msix/Assets/Square150x150Logo.png D release/windows/msix/Assets/Square150x150Logo.scale-100.png D release/windows/msix/Assets/Square150x150Logo.scale-125.png D release/windows/msix/Assets/Square150x150Logo.scale-150.png D release/windows/msix/Assets/Square150x150Logo.scale-200.png D release/windows/msix/Assets/Square150x150Logo.scale-400.png A release/windows/msix/Assets/Square310x310Logo.png D release/windows/msix/Assets/Square310x310Logo.scale-100.png D release/windows/msix/Assets/Square310x310Logo.scale-125.png D release/windows/msix/Assets/Square310x310Logo.scale-150.png D release/windows/msix/Assets/Square310x310Logo.scale-200.png D release/windows/msix/Assets/Square310x310Logo.scale-400.png D release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png D release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png D release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png D release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png D release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png D release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-16.png D release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png D release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-32.png D release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-48.png A release/windows/msix/Assets/Square44x44Logo.png D release/windows/msix/Assets/Square44x44Logo.scale-100.png D release/windows/msix/Assets/Square44x44Logo.scale-125.png D release/windows/msix/Assets/Square44x44Logo.scale-150.png D release/windows/msix/Assets/Square44x44Logo.scale-200.png D release/windows/msix/Assets/Square44x44Logo.scale-400.png D release/windows/msix/Assets/Square44x44Logo.targetsize-16.png D release/windows/msix/Assets/Square44x44Logo.targetsize-24.png D release/windows/msix/Assets/Square44x44Logo.targetsize-24_altform-unplated.png D release/windows/msix/Assets/Square44x44Logo.targetsize-256.png D release/windows/msix/Assets/Square44x44Logo.targetsize-32.png D release/windows/msix/Assets/Square44x44Logo.targetsize-48.png A release/windows/msix/Assets/Square71x71Logo.png D release/windows/msix/Assets/Square71x71Logo.scale-100.png D release/windows/msix/Assets/Square71x71Logo.scale-125.png D release/windows/msix/Assets/Square71x71Logo.scale-150.png D release/windows/msix/Assets/Square71x71Logo.scale-200.png D release/windows/msix/Assets/Square71x71Logo.scale-400.png A release/windows/msix/Assets/StoreLogo.png D release/windows/msix/Assets/StoreLogo.scale-100.png D release/windows/msix/Assets/StoreLogo.scale-125.png D release/windows/msix/Assets/StoreLogo.scale-150.png D release/windows/msix/Assets/StoreLogo.scale-200.png D release/windows/msix/Assets/StoreLogo.scale-400.png A release/windows/msix/Assets/Wide310x150Logo.png D release/windows/msix/Assets/Wide310x150Logo.scale-100.png D release/windows/msix/Assets/Wide310x150Logo.scale-125.png D release/windows/msix/Assets/Wide310x150Logo.scale-150.png D release/windows/msix/Assets/Wide310x150Logo.scale-200.png D release/windows/msix/Assets/Wide310x150Logo.scale-400.png D release/windows/msix/Assets/contrast-black/Square150x150Logo.scale-100.png D release/windows/msix/Assets/contrast-black/Square150x150Logo.scale-125.png D release/windows/msix/Assets/contrast-black/Square150x150Logo.scale-150.png D release/windows/msix/Assets/contrast-black/Square150x150Logo.scale-200.png D release/windows/msix/Assets/contrast-black/Square150x150Logo.scale-400.png D release/windows/msix/Assets/contrast-black/Square310x310Logo.scale-100.png D release/windows/msix/Assets/contrast-black/Square310x310Logo.scale-125.png D release/windows/msix/Assets/contrast-black/Square310x310Logo.scale-150.png D release/windows/msix/Assets/contrast-black/Square310x310Logo.scale-200.png D release/windows/msix/Assets/contrast-black/Square310x310Logo.scale-400.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-lightunplated_targetsize-16.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-lightunplated_targetsize-24.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-lightunplated_targetsize-256.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-lightunplated_targetsize-32.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-lightunplated_targetsize-48.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-unplated_targetsize-16.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-unplated_targetsize-256.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-unplated_targetsize-32.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.altform-unplated_targetsize-48.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.scale-100.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.scale-125.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.scale-150.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.scale-200.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.scale-400.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.targetsize-16.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.targetsize-24.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.targetsize-24_altform-unplated.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.targetsize-256.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.targetsize-32.png D release/windows/msix/Assets/contrast-black/Square44x44Logo.targetsize-48.png D release/windows/msix/Assets/contrast-black/Square71x71Logo.scale-100.png D release/windows/msix/Assets/contrast-black/Square71x71Logo.scale-125.png D release/windows/msix/Assets/contrast-black/Square71x71Logo.scale-150.png D release/windows/msix/Assets/contrast-black/Square71x71Logo.scale-200.png D release/windows/msix/Assets/contrast-black/Square71x71Logo.scale-400.png D release/windows/msix/Assets/contrast-black/StoreLogo.scale-100.png D release/windows/msix/Assets/contrast-black/StoreLogo.scale-125.png D release/windows/msix/Assets/contrast-black/StoreLogo.scale-150.png D release/windows/msix/Assets/contrast-black/StoreLogo.scale-200.png D release/windows/msix/Assets/contrast-black/StoreLogo.scale-400.png D release/windows/msix/Assets/contrast-black/Wide310x150Logo.scale-100.png D release/windows/msix/Assets/contrast-black/Wide310x150Logo.scale-125.png D release/windows/msix/Assets/contrast-black/Wide310x150Logo.scale-150.png D release/windows/msix/Assets/contrast-black/Wide310x150Logo.scale-200.png D release/windows/msix/Assets/contrast-black/Wide310x150Logo.scale-400.png D release/windows/msix/Assets/contrast-white/Square150x150Logo.scale-100.png D release/windows/msix/Assets/contrast-white/Square150x150Logo.scale-125.png D release/windows/msix/Assets/contrast-white/Square150x150Logo.scale-150.png D release/windows/msix/Assets/contrast-white/Square150x150Logo.scale-200.png D release/windows/msix/Assets/contrast-white/Square150x150Logo.scale-400.png D release/windows/msix/Assets/contrast-white/Square310x310Logo.scale-100.png D release/windows/msix/Assets/contrast-white/Square310x310Logo.scale-125.png D release/windows/msix/Assets/contrast-white/Square310x310Logo.scale-150.png D release/windows/msix/Assets/contrast-white/Square310x310Logo.scale-200.png D release/windows/msix/Assets/contrast-white/Square310x310Logo.scale-400.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-lightunplated_targetsize-16.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-lightunplated_targetsize-24.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-lightunplated_targetsize-256.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-lightunplated_targetsize-32.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-lightunplated_targetsize-48.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-unplated_targetsize-16.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-unplated_targetsize-256.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-unplated_targetsize-32.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.altform-unplated_targetsize-48.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.scale-100.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.scale-125.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.scale-150.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.scale-200.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.scale-400.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.targetsize-16.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.targetsize-24.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.targetsize-24_altform-unplated.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.targetsize-256.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.targetsize-32.png D release/windows/msix/Assets/contrast-white/Square44x44Logo.targetsize-48.png D release/windows/msix/Assets/contrast-white/Square71x71Logo.scale-100.png D release/windows/msix/Assets/contrast-white/Square71x71Logo.scale-125.png D release/windows/msix/Assets/contrast-white/Square71x71Logo.scale-150.png D release/windows/msix/Assets/contrast-white/Square71x71Logo.scale-200.png D release/windows/msix/Assets/contrast-white/Square71x71Logo.scale-400.png D release/windows/msix/Assets/contrast-white/StoreLogo.scale-100.png D release/windows/msix/Assets/contrast-white/StoreLogo.scale-125.png D release/windows/msix/Assets/contrast-white/StoreLogo.scale-150.png D release/windows/msix/Assets/contrast-white/StoreLogo.scale-200.png D release/windows/msix/Assets/contrast-white/StoreLogo.scale-400.png D release/windows/msix/Assets/contrast-white/Wide310x150Logo.scale-100.png D release/windows/msix/Assets/contrast-white/Wide310x150Logo.scale-125.png D release/windows/msix/Assets/contrast-white/Wide310x150Logo.scale-150.png D release/windows/msix/Assets/contrast-white/Wide310x150Logo.scale-200.png D release/windows/msix/Assets/contrast-white/Wide310x150Logo.scale-400.png M release/windows/msix/README.md M release/windows/msix/create_msix_package.py D release/windows/msix/priconfig.xml M source/tools =================================================================== diff --git a/release/datafiles/locale b/release/datafiles/locale index 618b655bcd5..877a343fed9 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 618b655bcd53da5ed762cef16975bc75e14ed7ea +Subproject commit 877a343fed9613d8e02e7fe7181d3bbb628506f2 diff --git a/release/scripts/addons b/release/scripts/addons index d2dc4908761..a3fa40ec0ba 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit d2dc4908761b65b28e51ff90d66226ee3bb25efb +Subproject commit a3fa40ec0ba525bc96cbfad49f854a0230b0524e diff --git a/release/windows/msix/Assets/Square150x150Logo.png b/release/windows/msix/Assets/Square150x150Logo.png new file mode 100644 index 00000000000..7dbbde793ba Binary files /dev/null and b/release/windows/msix/Assets/Square150x150Logo.png differ diff --git a/release/windows/msix/Assets/Square150x150Logo.scale-100.png b/release/windows/msix/Assets/Square150x150Logo.scale-100.png deleted file mode 100644 index 3918e2e2e5f..00000000000 Binary files a/release/windows/msix/Assets/Square150x150Logo.scale-100.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square150x150Logo.scale-125.png b/release/windows/msix/Assets/Square150x150Logo.scale-125.png deleted file mode 100644 index f9c53441f78..00000000000 Binary files a/release/windows/msix/Assets/Square150x150Logo.scale-125.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square150x150Logo.scale-150.png b/release/windows/msix/Assets/Square150x150Logo.scale-150.png deleted file mode 100644 index e57e851e3a8..00000000000 Binary files a/release/windows/msix/Assets/Square150x150Logo.scale-150.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square150x150Logo.scale-200.png b/release/windows/msix/Assets/Square150x150Logo.scale-200.png deleted file mode 100644 index a0b1edd769f..00000000000 Binary files a/release/windows/msix/Assets/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square150x150Logo.scale-400.png b/release/windows/msix/Assets/Square150x150Logo.scale-400.png deleted file mode 100644 index 411c76a3cbf..00000000000 Binary files a/release/windows/msix/Assets/Square150x150Logo.scale-400.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square310x310Logo.png b/release/windows/msix/Assets/Square310x310Logo.png new file mode 100644 index 00000000000..2190415e35b Binary files /dev/null and b/release/windows/msix/Assets/Square310x310Logo.png differ diff --git a/release/windows/msix/Assets/Square310x310Logo.scale-100.png b/release/windows/msix/Assets/Square310x310Logo.scale-100.png deleted file mode 100644 index 73a89b6b871..00000000000 Binary files a/release/windows/msix/Assets/Square310x310Logo.scale-100.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square310x310Logo.scale-125.png b/release/windows/msix/Assets/Square310x310Logo.scale-125.png deleted file mode 100644 index e3583f43179..00000000000 Binary files a/release/windows/msix/Assets/Square310x310Logo.scale-125.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square310x310Logo.scale-150.png b/release/windows/msix/Assets/Square310x310Logo.scale-150.png deleted file mode 100644 index 855022d9439..00000000000 Binary files a/release/windows/msix/Assets/Square310x310Logo.scale-150.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square310x310Logo.scale-200.png b/release/windows/msix/Assets/Square310x310Logo.scale-200.png deleted file mode 100644 index dd19deb2dbc..00000000000 Binary files a/release/windows/msix/Assets/Square310x310Logo.scale-200.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square310x310Logo.scale-400.png b/release/windows/msix/Assets/Square310x310Logo.scale-400.png deleted file mode 100644 index 7eeaff1dfbe..00000000000 Binary files a/release/windows/msix/Assets/Square310x310Logo.scale-400.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png deleted file mode 100644 index b1690a98133..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png deleted file mode 100644 index 7a469b9827b..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png deleted file mode 100644 index 3e9fe73f116..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png deleted file mode 100644 index 9e5bd478b2f..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png deleted file mode 100644 index 1656687d414..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-16.png deleted file mode 100644 index b1690a98133..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png deleted file mode 100644 index 3e9fe73f116..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-32.png deleted file mode 100644 index 9e5bd478b2f..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-48.png deleted file mode 100644 index 1656687d414..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.png b/release/windows/msix/Assets/Square44x44Logo.png new file mode 100644 index 00000000000..7b9ca070558 Binary files /dev/null and b/release/windows/msix/Assets/Square44x44Logo.png differ diff --git a/release/windows/msix/Assets/Square44x44Logo.scale-100.png b/release/windows/msix/Assets/Square44x44Logo.scale-100.png deleted file mode 100644 index f3961184764..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.scale-100.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.scale-125.png b/release/windows/msix/Assets/Square44x44Logo.scale-125.png deleted file mode 100644 index 388309db632..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.scale-125.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.scale-150.png b/release/windows/msix/Assets/Square44x44Logo.scale-150.png deleted file mode 100644 index 2e188ea9815..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.scale-150.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.scale-200.png b/release/windows/msix/Assets/Square44x44Logo.scale-200.png deleted file mode 100644 index faa6741a5c3..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.scale-400.png b/release/windows/msix/Assets/Square44x44Logo.scale-400.png deleted file mode 100644 index 5251cd570d2..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.scale-400.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.targetsize-16.png b/release/windows/msix/Assets/Square44x44Logo.targetsize-16.png deleted file mode 100644 index b1690a98133..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.targetsize-16.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.targetsize-24.png b/release/windows/msix/Assets/Square44x44Logo.targetsize-24.png deleted file mode 100644 index 7a469b9827b..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.targetsize-24.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/release/windows/msix/Assets/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index 7a469b9827b..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.targetsize-256.png b/release/windows/msix/Assets/Square44x44Logo.targetsize-256.png deleted file mode 100644 index 3e9fe73f116..00000000000 Binary files a/release/windows/msix/Assets/Square44x44Logo.targetsize-256.png and /dev/null differ diff --git a/release/windows/msix/Assets/Square44x44Logo.targetsize-32.png b/release/windows/msix/Assets/Square44x44Logo.targetsize-32.png deleted file mode 100644 index 9e5bd478b2f..00000000000 Binary files a/release/windo @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
