Merge branch 'master' into hl1-mdl-deletion-temp-nodes

2020-01-21 11:57:49 -05:00
parent b7e51a38ef 913dced038
commit caf9e31181
17 changed files with 173 additions and 1 deletions
--- a/code/FBX/FBXConverter.cpp
+++ b/code/FBX/FBXConverter.cpp
@@ -1564,7 +1564,7 @@ namespace Assimp {

                bone_map.clear();
            }
-            catch (std::exception&e) {
+            catch (std::exception&) {
                std::for_each(bones.begin(), bones.end(), Util::delete_fun<aiBone>());
                throw;
            }