code refactoring 'point & line' brushes...
Merge remote-tracking branch 'origin/develop' into jui.develop