[neon/backports-focal/assimp/Neon/unstable] debian/patches: Revert "Add patch to fix crash when model has no usable materials"

[Jonathan Riddell]

Git commit 3b8a06d3ebc02a755359cee6aea461fe0281b388 by Jonathan Riddell.
Committed on 16/12/2021 at 13:23.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "Add patch to fix crash when model has no usable materials"

This reverts commit 135bf8ffcb70df7fe54a7d895cff95279027754a.

D  +0    -29   debian/patches/fix-redundant-materials.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/backports-focal/assimp/commit/3b8a06d3ebc02a755359cee6aea461fe0281b388

diff --git a/debian/patches/fix-redundant-materials.patch b/debian/patches/fix-redundant-materials.patch
deleted file mode 100644
index 8611527..0000000
--- a/debian/patches/fix-redundant-materials.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix crash if a model has no materials
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/assimp/assimp/pull/4226
-Last-Update: 2021-12-07
----
- code/PostProcessing/RemoveRedundantMaterials.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/code/PostProcessing/RemoveRedundantMaterials.cpp b/code/PostProcessing/RemoveRedundantMaterials.cpp
-index 36745fb..f6355fc 100644
---- a/code/PostProcessing/RemoveRedundantMaterials.cpp
-+++ b/code/PostProcessing/RemoveRedundantMaterials.cpp
-@@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <assimp/ParsingUtils.h>
- #include "ProcessHelper.h"
- #include "Material/MaterialSystem.h"
-+#include <assimp/Exceptional.h>
- #include <stdio.h>
- 
- using namespace Assimp;
-@@ -171,6 +172,8 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
-         }
-         // If the new material count differs from the original,
-         // we need to rebuild the material list and remap mesh material indexes.
-+        if(iNewNum < 1)
-+          throw DeadlyImportError("No materials remaining");
-         if (iNewNum != pScene->mNumMaterials) {
-             ai_assert(iNewNum > 0);
-             aiMaterial** ppcMaterials = new aiMaterial*[iNewNum];
diff --git a/debian/patches/series b/debian/patches/series
index 965c897..92e466a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ pyassimp.patch
 pyassimp_faces.patch
 doxygen.patch
 fix-LWOLoader.patch
-fix-redundant-materials.patch