From 60526e3a044c384ef84673e6ad466ba77c522eb6 Mon Sep 17 00:00:00 2001 From: MrBlockCat <37186692+MrBlockCat@users.noreply.github.com> Date: Mon, 16 Mar 2020 04:05:24 -0400 Subject: [PATCH 1/3] Makes plastic tool icons vector --- toonz/sources/toonz/Resources/plastic.svg | 33 ++++--------------- .../toonz/Resources/plastic_rollover.svg | 31 ++++------------- 2 files changed, 14 insertions(+), 50 deletions(-) diff --git a/toonz/sources/toonz/Resources/plastic.svg b/toonz/sources/toonz/Resources/plastic.svg index 72c2937e..115b3dc0 100644 --- a/toonz/sources/toonz/Resources/plastic.svg +++ b/toonz/sources/toonz/Resources/plastic.svg @@ -1,26 +1,7 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/toonz/sources/toonz/Resources/plastic_rollover.svg b/toonz/sources/toonz/Resources/plastic_rollover.svg index 0350dccd..f636b35d 100644 --- a/toonz/sources/toonz/Resources/plastic_rollover.svg +++ b/toonz/sources/toonz/Resources/plastic_rollover.svg @@ -1,24 +1,7 @@ - - - - - - - + + + + + + + \ No newline at end of file From abc88dccc06f2622b193c382fb8a7a9a59e4cd1d Mon Sep 17 00:00:00 2001 From: MrBlockCat <37186692+MrBlockCat@users.noreply.github.com> Date: Mon, 16 Mar 2020 04:06:17 -0400 Subject: [PATCH 2/3] Make .DS_Store files be ignored Macs add .DS_Store files all over the place, which we don't want showing up in repositories! --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7d97f865..0d215088 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ ipch/ *.creator *.files *.includes + +#macOS +.DS_Store From 4403e41d356fa1aa63a21bec74487165873e2995 Mon Sep 17 00:00:00 2001 From: MrBlockCat <37186692+MrBlockCat@users.noreply.github.com> Date: Mon, 16 Mar 2020 10:35:28 -0400 Subject: [PATCH 3/3] Revert "Makes plastic tool icons vector" This reverts commit 60526e3a044c384ef84673e6ad466ba77c522eb6. --- toonz/sources/toonz/Resources/plastic.svg | 33 +++++++++++++++---- .../toonz/Resources/plastic_rollover.svg | 31 +++++++++++++---- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/toonz/sources/toonz/Resources/plastic.svg b/toonz/sources/toonz/Resources/plastic.svg index 115b3dc0..72c2937e 100644 --- a/toonz/sources/toonz/Resources/plastic.svg +++ b/toonz/sources/toonz/Resources/plastic.svg @@ -1,7 +1,26 @@ - - - - - - - \ No newline at end of file + + + + + + + diff --git a/toonz/sources/toonz/Resources/plastic_rollover.svg b/toonz/sources/toonz/Resources/plastic_rollover.svg index f636b35d..0350dccd 100644 --- a/toonz/sources/toonz/Resources/plastic_rollover.svg +++ b/toonz/sources/toonz/Resources/plastic_rollover.svg @@ -1,7 +1,24 @@ - - - - - - - \ No newline at end of file + + + + + + +