Fix reloading meshes with ResourceManager

Unloading was clearing the format of VertexSetup and it wouldn't accept
the vertex array.  Setting storage format should also be skipped while
loading from a file if the same format was set previously.

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index 6e3a2b93a922a73e80e41d230a46735bd6872b06..84a7b73183a20e2236c0f24ce387b4a0b3a47088 100644 (file)
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -255,7 +255,8 @@ void Mesh::Loader::storage(const vector<VertexAttribute> &attrs)
        VertexFormat fmt;
        for(VertexAttribute a: attrs)
                fmt = (fmt, a);
-       obj.storage(fmt);
+       if(fmt!=obj.vertices.get_format())
+               obj.storage(fmt);
 }
 
 void Mesh::Loader::vertices()

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 7df3b67b443e6a3a52e48270629bf8f304053ddf..98b6fc0d840a912ac86c21a7df1ee974b450db7d 100644 (file)
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -87,9 +87,7 @@ void VertexSetup::unload()
        VertexSetupBackend::unload();
 
        vertex_array = nullptr;
-       vertex_format = VertexFormat();
        inst_array = nullptr;
-       inst_format = VertexFormat();
        index_buffer = nullptr;
 }