map_editor_glut now supports more objects'
'
fix trivial conflict