eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 19:49:19 +02:00
Code Issues 123 Wiki Activity

tmj merge

Browse Source
This commit is contained in:
milek7
2017-10-30 16:30:04 +01:00
parent ab31610afe 5e09a6b90d
commit 16923d20f7
73 changed files with 9521 additions and 7735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
material.h
View File

@@ -28,9 +28,9 @@ struct opengl_material {
bool
deserialize( cParser &Input, bool const Loadnow );
private:
// imports member data pair from the config file
// imports member data pair from the config file, overriding existing parameter values of lower priority
bool
deserialize_mapping( cParser &Input, bool const Loadnow );
deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow );
};
class material_manager {