Make way-points non-select-able when a tool is selected in editor

Fixes #952