fixed assets merge conflict
cleaned up code, but now textures aren't showing up because weirdness in mesh.cpp