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/ConvertToLHProcess.h | |
| parent | 471271b727fd1dcc716a10f34e615ce61ca6d16e (diff) | |
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/ConvertToLHProcess.h')
| -rw-r--r-- | thirdparty/assimp/code/PostProcessing/ConvertToLHProcess.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/thirdparty/assimp/code/PostProcessing/ConvertToLHProcess.h b/thirdparty/assimp/code/PostProcessing/ConvertToLHProcess.h index de984a1052..f32b91fc39 100644 --- a/thirdparty/assimp/code/PostProcessing/ConvertToLHProcess.h +++ b/thirdparty/assimp/code/PostProcessing/ConvertToLHProcess.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. @@ -137,9 +137,8 @@ public: // ------------------------------------------------------------------- void Execute( aiScene* pScene); -public: - /** Some other types of post-processing require winding order flips */ - static void ProcessMesh( aiMesh* pMesh); +protected: + void ProcessMesh( aiMesh* pMesh); }; // --------------------------------------------------------------------------- |