Merge branch 'master' into gfx-work

2026-07-22 01:19:19 +02:00 · 2018-09-20 19:14:28 +02:00
parent 0453e10534 d9687a4e1f
commit 7c6501bb07
114 changed files with 9353 additions and 6114 deletions
--- a/material.h
+++ b/material.h
@@ -44,6 +44,9 @@ private:
    bool
        deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow );
        void log_error(const std::string &str);
+    // extracts name of the sound file from provided data stream
+    std::string
+        deserialize_filename( cParser &Input );

 // members
    // priorities for textures, shader, opacity