diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-09 10:42:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-09 10:42:18 +0100 |
| commit | da1f80c1f2d71aeaee9f57fd19fc2ea4f76c487d (patch) | |
| tree | e7f0d1caae79f594d43be8d5068a04c285e2c5bc /thirdparty/assimp/code/PostProcessing/OptimizeGraph.h | |
| parent | 471271b727fd1dcc716a10f34e615ce61ca6d16e (diff) | |
| download | redot-engine-da1f80c1f2d71aeaee9f57fd19fc2ea4f76c487d.tar.gz | |
Revert "assimp: Sync with upstream 0201fc5"
This reverts commit 78b22393a8dd182ee56d0448ed77ba4430de5e75.
It caused a regression in FBX import leading to crashes.
Fixes #36908.
Diffstat (limited to 'thirdparty/assimp/code/PostProcessing/OptimizeGraph.h')
| -rw-r--r-- | thirdparty/assimp/code/PostProcessing/OptimizeGraph.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/thirdparty/assimp/code/PostProcessing/OptimizeGraph.h b/thirdparty/assimp/code/PostProcessing/OptimizeGraph.h index 34f70854f7..82cc5db3fe 100644 --- a/thirdparty/assimp/code/PostProcessing/OptimizeGraph.h +++ b/thirdparty/assimp/code/PostProcessing/OptimizeGraph.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2020, assimp team +Copyright (c) 2006-2019, assimp team All rights reserved. @@ -75,13 +75,13 @@ public: ~OptimizeGraphProcess(); // ------------------------------------------------------------------- - bool IsActive( unsigned int pFlags) const override; + bool IsActive( unsigned int pFlags) const; // ------------------------------------------------------------------- - void Execute( aiScene* pScene) override; + void Execute( aiScene* pScene); // ------------------------------------------------------------------- - void SetupProperties(const Importer* pImp) override; + void SetupProperties(const Importer* pImp); // ------------------------------------------------------------------- /** @brief Add a list of node names to be locked and not modified. |