Merge branch 'tmj-dev'

material.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Classes.h"
 #include "Texture.h"
-#include "parser.h"
 
 typedef int material_handle;
 
@@ -24,13 +24,20 @@ struct opengl_material {
 
     bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1
     std::string name;
-// methods:
+
+// methods
     bool
         deserialize( cParser &Input, bool const Loadnow );
+
 private:
+// methods
     // imports member data pair from the config file, overriding existing parameter values of lower priority
     bool
         deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow );
+
+// members
+    int priority1 { -1 }; // priority of last loaded primary texture
+    int priority2 { -1 }; // priority of last loaded secondary texture
 };
 
 class material_manager {