fix conflicts caused by FilterMenu
changes to Tool panel struct
#290
Annotations
10 warnings
FilterMenu
changes to Tool panel struct
#290