Merge remote-tracking branch 'upstream/dev' into dev
Add a Conics Mode selector in the Node Editor
Merge pull request #114 from sarbian/Conics-Selector

Add a conic patch draw mode selector in the Node Editor