Fixed fill tool

--changed tool change function to account for tTool.shape aswell