From da1f80c1f2d71aeaee9f57fd19fc2ea4f76c487d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 9 Mar 2020 10:42:18 +0100 Subject: Revert "assimp: Sync with upstream 0201fc5" This reverts commit 78b22393a8dd182ee56d0448ed77ba4430de5e75. It caused a regression in FBX import leading to crashes. Fixes #36908. --- thirdparty/assimp/code/PostProcessing/RemoveRedundantMaterials.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'thirdparty/assimp/code/PostProcessing/RemoveRedundantMaterials.cpp') diff --git a/thirdparty/assimp/code/PostProcessing/RemoveRedundantMaterials.cpp b/thirdparty/assimp/code/PostProcessing/RemoveRedundantMaterials.cpp index 0c42804103..49ec8f5c47 100644 --- a/thirdparty/assimp/code/PostProcessing/RemoveRedundantMaterials.cpp +++ b/thirdparty/assimp/code/PostProcessing/RemoveRedundantMaterials.cpp @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2020, assimp team +Copyright (c) 2006-2019, assimp team -- cgit v1.2.3