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/Common/DefaultLogger.cpp | |
| 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/Common/DefaultLogger.cpp')
| -rw-r--r-- | thirdparty/assimp/code/Common/DefaultLogger.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/thirdparty/assimp/code/Common/DefaultLogger.cpp b/thirdparty/assimp/code/Common/DefaultLogger.cpp index adb9ba1600..de3528d2b4 100644 --- a/thirdparty/assimp/code/Common/DefaultLogger.cpp +++ b/thirdparty/assimp/code/Common/DefaultLogger.cpp @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2020, assimp team +Copyright (c) 2006-2019, assimp team @@ -107,7 +107,7 @@ LogStream* LogStream::createDefaultStream(aiDefaultLogStream streams, return nullptr; #endif - // Platform-independent default streams + // Platform-independent default streams case aiDefaultLogStream_STDERR: return new StdOStreamLogStream(std::cerr); case aiDefaultLogStream_STDOUT: @@ -121,7 +121,7 @@ LogStream* LogStream::createDefaultStream(aiDefaultLogStream streams, }; // For compilers without dead code path detection - return nullptr; + return NULL; } // ---------------------------------------------------------------------------------- |