Fix shape brush tips so they use random instead of incremental
(cherry picked from commit 243f91f63812145ad5c1d6ba821248cbab7aa6bf)