From 52d1dc7c68a7a6ee67510fc5d1e206cabcf0d874 Mon Sep 17 00:00:00 2001
From: Rodney <rodney.baker@gmail.com>
Date: Mar 17 2020 03:20:09 +0000
Subject: Merge pull request #3155 from MrBlockCat/master


Fix Raster Tool Bar Plastic Tool Icons
---

diff --git a/.gitignore b/.gitignore
index 0d21508..7d97f86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,3 @@ ipch/
 *.creator
 *.files
 *.includes
-
-#macOS
-.DS_Store
diff --git a/toonz/sources/toonz/Resources/plastic.svg b/toonz/sources/toonz/Resources/plastic.svg
index 72c2937..1b8c80d 100644
--- a/toonz/sources/toonz/Resources/plastic.svg
+++ b/toonz/sources/toonz/Resources/plastic.svg
@@ -1,26 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="25.997px" height="25.997px" viewBox="0 0 25.997 25.997" enable-background="new 0 0 25.997 25.997" xml:space="preserve">
-<image overflow="visible" width="26" height="26" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA
-IGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAOkSURBVHjarJa9SyNr
-FMZ/LhcVi4nExo8RPwoxieA6TSYK6lZ2rrdIYArRwl7xD5jV+QfiBQsLcXexEIRwWewiGrUwEaJx
-A0lhSO4KDqmikVjENO9tJrnxYzV33QcG5n3P8D5zznnOOS/8HF2SJPnb29s/A128AUKIJ3s2YAYI
-SZIkNE0TmqYJ4Ab49DuIxoDPwI3H4xF+v18kk0mxs7MjMpmMCAaDwul0CiD2K96Vif4GBCAWFxeF
-aZqVJxAIPFjPzc2VvRv7VY/KIYvJslwhfExkmqbw+/3C+rGZt+SoHMbQwMDAs0SmaYpgMCgkSRK1
-eiaEoA7AMAwb0Kzr+mXZaLfb53t7e5ccDkezz+ejVCpRX18PQKlUYn9/n5OTk3w0Gu0Gbl8jeme9
-vwfODcOoKOv6+vqvaDQ6vrm5mT89PUVVVRRFQVEUVFVlcnKSrq6uZmChFq/qDMMYs4hWrL0fwIKu
-69+s9SBwHolE6OzsBCCbzZLNZikWi3i93nNgqBaPloDZqv1uYMEwjLKMvwMr6+vrABQKBVKpFIqi
-MDw8XI7Gq3in6/qHKvfzwKyu6x+q8wUcJBIJ7u/vicViuN3u/12076oIloBuXde/PvNdHiAWi+Fy
-uWhoaADg9vaW3415VVXF8fHxA5lvbW2Jpqam0OOPDcMYfJyjP2phGRkZGdc0jVwuRzabrezH43Ha
-2try6XSaqjJZsXJeV31GLUS2dDo95XA46O/vByCXy3F2doZpmqTT6XOL5JOV62ZrPQbkdV3/Xp2j
-lzBlt9srJJeXl6RSKUZHR0mlUgAHhmF8rCax8EDNtXg05fP5ALi4uODu7g5VVQFIJBIAP3RdvzQM
-o7sqbFhq/q9gayC6iUQizaZpYrfb6evrqxg6OjqenGEJYUnX9T+f9LqX0NjYKNbW1lAUhZaWlgc2
-t9vN1dXVOHBYU1N9CS6XKzQ9PT3ucrme2HK5HIZh5DOZzBfgwKq3w0eTACHEYS2hm3E6nV92d3ef
-GI6Ojujp6WF7e5twOAxAOBymtbWVoaEhisUioVBoVgjxta7Ggo15vd73y8vL2Gy2SmMtFAqVnOVy
-ubIK2dvbY2NjI18sFmeBbz8bfM/WEhCSZVn4/f5KV4jH4yIQCIhAICBCoZDIZDLC6/WWx/3gaxP2
-xTAC/8iyLDRNE6urqyKTyQjTNEUymRQTExPlC4ytllFeCz6Wb02SJAmPxyNkWRZA6DHJW4keXDQt
-dc2/JO9/BwDMzfwBXVCxjwAAAABJRU5ErkJggg==" transform="matrix(0.9999 0 0 0.9999 0 0)">
-</image>
-</svg>
+<svg width="26px" height="26px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g style="">  <path d="M1.677346,3.711311 L8.746245,0.837143 C8.746245,0.837143,14.096345,5.669747,15.528286,7.325428 C17.094470,9.115353,16.820583,11.165940,16.154760,13.321678 C15.774418,14.743147,14.404145,17.512138,16.910041,19.749545 C18.565722,20.823500,21.796520,20.723276,23.427804,20.956317 C22.085777,22.137061,18.067870,25.228728,18.067870,25.228728 C18.067870,25.228728,9.739559,25.116044,8.885077,19.989151 C9.048458,16.509562,10.178049,16.549905,10.764499,13.142686 C10.745943,10.200111,8.989159,8.756614,7.855870,7.414924 C6.379181,6.027732,1.677346,3.711311,1.677346,3.711311 Z " style="fill: rgba(212, 212, 212, 1.000000); " fill="#dbdcdb" stroke="none" />
+  <path d="M1.121395,9.175152 L2.726007,9.175549 L2.718590,7.003655 L6.055751,9.611972 L2.721549,12.066859 L2.721549,9.940940 L1.103947,9.940542 L1.121395,9.175152 Z " style="fill: rgba(111, 111, 111, 1.000000); " fill="#818281" stroke="none" />
+  <path d="M22.897275,16.101618 L21.292663,16.099926 L21.298328,18.271826 L17.963273,15.660818 L21.299454,13.208621 L21.297739,15.334540 L22.915340,15.336242 L22.897275,16.101618 Z " style="fill: rgba(111, 111, 111, 1.000000); " fill="#818281" stroke="none" />
+  <path d="M8.640000,1.790000 L7.321458,5.724866 L14.430000,7.220000 L11.691855,14.040000 L15.125895,14.287787 L10.065161,19.212403 L15.810000,19.750000 L14.106734,23.569199 L21.960000,21.420000 " stroke-linejoin="round" stroke-linecap="round" style="fill: none; stroke-width: 1.000000px; stroke: rgba(163, 163, 163, 1.000000); " fill="none" stroke="#b1b2b1" stroke-width="1.000000" />
+  <path d="M1.867098,3.711311 L8.935997,0.837143 C8.935997,0.837143,14.286097,5.669747,15.718038,7.325428 C17.284222,9.115353,17.010335,11.165940,16.344512,13.321678 C15.964170,14.743147,14.593897,17.512138,17.099793,19.749545 C18.755474,20.823500,21.986272,20.723276,23.617556,20.956317 C22.275529,22.137061,18.257622,25.228728,18.257622,25.228728 C18.257622,25.228728,9.929311,25.116044,9.074829,19.989151 C9.238210,16.509562,10.367801,16.549905,10.954251,13.142686 C10.935695,10.200111,9.178911,8.756614,8.045622,7.414924 C6.568933,6.027732,1.867098,3.711311,1.867098,3.711311 Z " stroke-linejoin="round" stroke-linecap="round" style="fill: none; stroke-width: 1.000000px; stroke: rgba(0, 0, 0, 1.000000); " fill="none" stroke="#000000" stroke-width="1.000000" />
+</g></svg>
\ 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 0350dcc..c39e211 100644
--- a/toonz/sources/toonz/Resources/plastic_rollover.svg
+++ b/toonz/sources/toonz/Resources/plastic_rollover.svg
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="25.997px" height="25.997px" viewBox="0 0 25.997 25.997" enable-background="new 0 0 25.997 25.997" xml:space="preserve">
-<image overflow="visible" width="26" height="26" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA
-IGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAANPSURBVHjarJZPaBxl
-GMZ/kS1tcMtExEKxOivR1INxIvQ0KrNhRQ89bEBBCYXZXrxu8CAFke2tuWUhi9fZ9lZSCEIhW9Jh
-W3bZQy6zSQ+imTI2B0176LdlA+lBeD04M91/ppOkz22+Geb5nud9vvf94P+hn9ROLp1+O+0AOseA
-iAytaYAN1DVNk7nLeZm7nBdAAaVXQWQBDqAsyxLHcUQpJdWGI939rnieJ4ZhCOAdRV1EtAoIIKVS
-SXpRWV/uey4Wi5E666iKIss8XddjwkEiERHHcSTcmH2cGkU21j+cOT+SSETE8zzRNE2SKhMRxgBc
-Ew2YyLV4FL0cf3O8+MbkxNWp6amJQqHA3vM90qfSAOw93+Nu7S4bjY3OXxt/Z4BniRS5JpZrolxz
-KFkGoJaWloZU3dpYkS/mc5IkjSLCmGtiATNAOVz/E1jItfi1h6wdBAGZTAaA9k6bzZ02+j8ZZmdn
-28AnLyN6DbgKFHrWM8CCa8Yx3gTK5fJ/+9h9tsudBzXszwpks1nCTSZDaJ2E9o1KU96yLOnud2Xx
-9jXp7ndjC8MEkkQRQCdUlsm1uD7i2w7A9WaVry98E4ei0+nwqlE89+k5afze6AvESm1FTrx+oj7C
-IWNQUSoJy7ufv5P9qvAlD5/4bO604/WbrZucPpvuPPUVPcekHNZ8rPcfSYi0p76am79wiezHWQD8
-xz43mlWmnpyn4TfbIUkJWAAmoroDnVyLTSCu0UGYmzwzGZM0/2hy50GNHy9ewf/NB7jnmuR7SUIM
-pvmlWI0ObG1rTaoNJ65R2Ib0yDbXxAnTK0l63SBUEARSWV+W2tZaXxhGRds1MVyT1UMTpU6l5Odb
-P8n27vZQG9J1PVFjjZvqQTgz/VZ9/vv57MzMcAN4+NincuWXjvJVFbgXnrf7A5MAEbmfxDrbMIyR
-42Lx9jUJgkBKpZJYliWWZQkg6bNp+eDi+/JeLiOAnbRGAJ5t26KUejGTHnl9Ndve3ZbK+rJU1pfl
-ux++ldR4SgH5w4QhmsB1XdfFcZxYTe/Pa1tr0t3vim3b0bg3Dpu6PhuBQNd1mb70kSzeeNFglVKS
-z+ejC4x2lHiPQj66NWmaJpZlRQmsD5Icl6jvohmmq3hQvP8dADBda1xkyDvKAAAAAElFTkSuQmCC" transform="matrix(0.9999 0 0 0.9999 0 0)">
-</image>
-</svg>
+<svg width="26px" height="26px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g style="">  <path d="M1.677346,3.711311 L8.746245,0.837143 C8.746245,0.837143,14.096345,5.669747,15.528286,7.325428 C17.094470,9.115353,16.820583,11.165940,16.154760,13.321678 C15.774418,14.743147,14.404145,17.512138,16.910041,19.749545 C18.565722,20.823500,21.796520,20.723276,23.427804,20.956317 C22.085777,22.137061,18.067870,25.228728,18.067870,25.228728 C18.067870,25.228728,9.739559,25.116044,8.885077,19.989151 C9.048458,16.509562,10.178049,16.549905,10.764499,13.142686 C10.745943,10.200111,8.989159,8.756614,7.855870,7.414924 C6.379181,6.027732,1.677346,3.711311,1.677346,3.711311 Z " style="fill: rgba(255, 255, 255, 1.000000); " fill="#fefffe" stroke="none" />
+  <path d="M1.121395,9.175152 L2.726007,9.175549 L2.718590,7.003655 L6.055751,9.611972 L2.721549,12.066859 L2.721549,9.940940 L1.103947,9.940542 L1.121395,9.175152 Z " style="fill: rgba(173, 39, 4, 1.000000); " fill="#bd3900" stroke="none" />
+  <path d="M22.897275,16.101618 L21.292663,16.099926 L21.298328,18.271826 L17.963273,15.660818 L21.299454,13.208621 L21.297739,15.334540 L22.915340,15.336242 L22.897275,16.101618 Z " style="fill: rgba(173, 39, 4, 1.000000); " fill="#bd3900" stroke="none" />
+  <path d="M8.640000,1.790000 L7.321458,5.724866 L14.430000,7.220000 L11.691855,14.040000 L14.990000,14.620000 L10.065161,19.212403 L15.810000,19.750000 L14.106734,23.569199 L21.960000,21.420000 " stroke-linejoin="round" stroke-linecap="round" style="fill: none; stroke-width: 1.000000px; stroke: rgba(139, 180, 137, 1.000000); " fill="none" stroke="#9bbf9a" stroke-width="1.000000" />
+  <path d="M1.867098,3.711311 L8.935997,0.837143 C8.935997,0.837143,14.286097,5.669747,15.718038,7.325428 C17.284222,9.115353,17.010335,11.165940,16.344512,13.321678 C15.964170,14.743147,14.593897,17.512138,17.099793,19.749545 C18.755474,20.823500,21.986272,20.723276,23.617556,20.956317 C22.275529,22.137061,18.257622,25.228728,18.257622,25.228728 C18.257622,25.228728,9.929311,25.116044,9.074829,19.989151 C9.238210,16.509562,10.367801,16.549905,10.954251,13.142686 C10.935695,10.200111,9.178911,8.756614,8.045622,7.414924 C6.568933,6.027732,1.867098,3.711311,1.867098,3.711311 Z " stroke-linejoin="round" stroke-linecap="round" style="fill: none; stroke-width: 1.000000px; stroke: rgba(0, 0, 0, 1.000000); " fill="none" stroke="#000000" stroke-width="1.000000" />
+</g></svg>
\ No newline at end of file