Codebase list assimp / ead60b2
Drop patches applied upstream. IOhannes m zmölnig (Debian/GNU) 2 years ago
3 changed file(s) with 0 addition(s) and 52 deletion(s). Raw diff Collapse all Expand all
+0
-21
debian/patches/fix-LWOLoader.patch less more
0 Description: Fix typo in LWOLoader that leads to crashes
1 Author: IOhannes m zmölnig
2 Forwarded: https://github.com/assimp/assimp/pull/4226
3 Last-Update: 2021-12-07
4 ---
5 code/AssetLib/LWO/LWOLoader.cpp | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/code/AssetLib/LWO/LWOLoader.cpp b/code/AssetLib/LWO/LWOLoader.cpp
9 index bc62152..801da1d 100644
10 --- a/code/AssetLib/LWO/LWOLoader.cpp
11 +++ b/code/AssetLib/LWO/LWOLoader.cpp
12 @@ -393,7 +393,7 @@ void LWOImporter::InternReadFile(const std::string &pFile,
13
14 // If a RGB color map is explicitly requested delete the
15 // alpha channel - it could theoretically be != 1.
16 - if (_mSurfaces[i].mVCMapType == AI_LWO_RGB)
17 + if (_mSurfaces[j].mVCMapType == AI_LWO_RGB)
18 pvVC[w]->a = 1.f;
19
20 pvVC[w]++;
+0
-29
debian/patches/fix-redundant-materials.patch less more
0 Description: Fix crash if a model has no materials
1 Author: IOhannes m zmölnig
2 Forwarded: https://github.com/assimp/assimp/pull/4226
3 Last-Update: 2021-12-07
4 ---
5 code/PostProcessing/RemoveRedundantMaterials.cpp | 3 +++
6 1 file changed, 3 insertions(+)
7
8 diff --git a/code/PostProcessing/RemoveRedundantMaterials.cpp b/code/PostProcessing/RemoveRedundantMaterials.cpp
9 index 36745fb..f6355fc 100644
10 --- a/code/PostProcessing/RemoveRedundantMaterials.cpp
11 +++ b/code/PostProcessing/RemoveRedundantMaterials.cpp
12 @@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13 #include <assimp/ParsingUtils.h>
14 #include "ProcessHelper.h"
15 #include "Material/MaterialSystem.h"
16 +#include <assimp/Exceptional.h>
17 #include <stdio.h>
18
19 using namespace Assimp;
20 @@ -171,6 +172,8 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
21 }
22 // If the new material count differs from the original,
23 // we need to rebuild the material list and remap mesh material indexes.
24 + if(iNewNum < 1)
25 + throw DeadlyImportError("No materials remaining");
26 if (iNewNum != pScene->mNumMaterials) {
27 ai_assert(iNewNum > 0);
28 aiMaterial** ppcMaterials = new aiMaterial*[iNewNum];
+0
-2
debian/patches/series less more
44 pyassimp.patch
55 pyassimp_faces.patch
66 doxygen.patch
7 fix-LWOLoader.patch
8 fix-redundant-materials.patch