bit on texture and maps
Merge branch 'dev.editor' into develop