This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include "Uniforms.glsl" | |
#include "Samplers.glsl" | |
#ifdef COMPILEVS | |
// Silence GLSL 150 deprecation warnings | |
#ifdef GL3 | |
#define attribute in | |
#define varying out | |
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/code/BlenderLoader.cpp b/code/BlenderLoader.cpp | |
index 3b9200b..b92cc98 100644 | |
--- a/code/BlenderLoader.cpp | |
+++ b/code/BlenderLoader.cpp | |
@@ -644,14 +644,17 @@ void BlenderImporter::ConvertMesh(const Scene& /*in*/, const Object* /*obj*/, co | |
// collect per-submesh numbers | |
std::map<int,size_t> per_mat; | |
+ std::map<int,size_t> per_mat_verts; | |
for (int i = 0; i < mesh->totface; ++i) { |