Merge branch 'master' into fixGenNormals

2021-05-06 17:28:37 +02:00
parent 3717e66fae 1c90d28f9b
commit e120544978
71 changed files with 1573 additions and 754 deletions
--- a/code/PostProcessing/RemoveRedundantMaterials.h
+++ b/code/PostProcessing/RemoveRedundantMaterials.h
@@ -81,7 +81,7 @@ public:
    /** @brief Set list of fixed (inmutable) materials
     *  @param fixed See #AI_CONFIG_PP_RRM_EXCLUDE_LIST
     */
-    void SetFixedMaterialsString(const std::string& fixed = "") {
+    void SetFixedMaterialsString(const std::string& fixed = std::string()) {
        mConfigFixedMaterials = fixed;
    }