Try to handle escaped windows style slashes

makehumancommunity · May 13, 2021 · 86bde3e · 86bde3e
1 parent 0a4a1b8
commit 86bde3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/mpfb/entities/material/makeskinmaterial.py b/src/mpfb/entities/material/makeskinmaterial.py
@@ -33,7 +33,9 @@ def _template(self, template_values, has, tex, key):
         template_values[has] = "false"
         template_values[tex] = "\"\""
         if key in self._settings and self._settings[key]:
-            _LOG.debug(key + " is set in mhmat")
+            _LOG.debug(key + " is set in mhmat", self._settings[key])
+            self._settings[key] = str(self._settings[key]).replace("\\\\", "/")
+            self._settings[key] = str(self._settings[key]).replace("\\", "/")
             template_values[has] = "true"
             template_values[tex] = "\"" + self._settings[key] + "\""
         else:

diff --git a/src/mpfb/entities/material/mhmatkeytypes.py b/src/mpfb/entities/material/mhmatkeytypes.py
@@ -69,6 +69,8 @@ def parse_file(self, input_line, location):
             # TODO: handle case where location is absolute. We cannot use basename since the path
             # TODO: continues into the structure of the file
             value = location + "/" + value
+        value = value.replace("\\\\", "/") # Try to avoid windows style slashes
+        value = value.replace("\\", "/")
         return self.key_name, value