diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 16:01:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 16:01:33 +0100 |
| commit | 62afc3c12c2acfbd5f9bbaf93f86111e4d2f3ce0 (patch) | |
| tree | 501c31a479e01cdca37377404ca728f36a0232d2 /thirdparty/assimp/code/PostProcessing/OptimizeGraph.h | |
| parent | 54fa07e7f01b21bc69309172b439bc05db571977 (diff) | |
| parent | 78b22393a8dd182ee56d0448ed77ba4430de5e75 (diff) | |
| download | redot-engine-62afc3c12c2acfbd5f9bbaf93f86111e4d2f3ce0.tar.gz | |
Merge pull request #36852 from akien-mga/assimp-unbundle
assimp: Clean and document buildsystem, update to upstream 0201fc5
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 82cc5db3fe..34f70854f7 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-2019, assimp team +Copyright (c) 2006-2020, assimp team All rights reserved. @@ -75,13 +75,13 @@ public: ~OptimizeGraphProcess(); // ------------------------------------------------------------------- - bool IsActive( unsigned int pFlags) const; + bool IsActive( unsigned int pFlags) const override; // ------------------------------------------------------------------- - void Execute( aiScene* pScene); + void Execute( aiScene* pScene) override; // ------------------------------------------------------------------- - void SetupProperties(const Importer* pImp); + void SetupProperties(const Importer* pImp) override; // ------------------------------------------------------------------- /** @brief Add a list of node names to be locked and not modified. |