From 94d977354804608d29281a7e3e940b71aa148865 Mon Sep 17 00:00:00 2001
From: FeeshWyvern <feeshwyvern@gmail.com>
Date: Mon, 27 Feb 2023 20:02:34 -0800
Subject: [PATCH 1/3] Bug fix: Correctly set the name of the attributes. PR
 #3940 did not seem to update in Master?

---
 port/PyAssimp/pyassimp/core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/port/PyAssimp/pyassimp/core.py b/port/PyAssimp/pyassimp/core.py
index 35ad882b3..37beac886 100644
--- a/port/PyAssimp/pyassimp/core.py
+++ b/port/PyAssimp/pyassimp/core.py
@@ -211,7 +211,7 @@ def _init(self, target = None, parent = None):
 
 
             else: # starts with 'm' but not iterable
-                setattr(target, m, obj)
+                setattr(target, name, obj)
                 logger.debug("Added " + name + " as self." + name + " (type: " + str(type(obj)) + ")")
 
                 if _is_init_type(obj):

From f9fcf33aaa639fbfd386631cb796ac66d01fef94 Mon Sep 17 00:00:00 2001
From: FeeshWyvern <feeshwyvern@gmail.com>
Date: Mon, 27 Feb 2023 20:06:05 -0800
Subject: [PATCH 2/3] Bug fix: We should not be accessing `mPrivate` according
 to structs.Scene and fixes a crash when `mPrivate` points to invalid data.

---
 port/PyAssimp/pyassimp/core.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/port/PyAssimp/pyassimp/core.py b/port/PyAssimp/pyassimp/core.py
index 37beac886..edde8b29a 100644
--- a/port/PyAssimp/pyassimp/core.py
+++ b/port/PyAssimp/pyassimp/core.py
@@ -115,6 +115,10 @@ def _init(self, target = None, parent = None):
         if m.startswith("_"):
             continue
 
+        # We should not be accessing `mPrivate` according to structs.Scene.
+        if m == 'mPrivate':
+            continue
+
         if m.startswith('mNum'):
             if 'm' + m[4:] in dirself:
                 continue # will be processed later on

From e2063b3ba6d3bee5b115edc75b00cede072c251a Mon Sep 17 00:00:00 2001
From: Steve M <praktique-tellypresence@yahoo.com>
Date: Fri, 17 Mar 2023 22:42:17 -0700
Subject: [PATCH 3/3] Revert to commit 13 May 2014 (08bacc7)

Changes were introduced to the binary portion of this file at some point
---
 test/models/PLY/pond.0.ply | Bin 2171788 -> 2171857 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/models/PLY/pond.0.ply b/test/models/PLY/pond.0.ply
index 02b7683cee063655c5b93ade29bc14b3f04e15dd..a45e0322d856bbef01c46b7a5a45a0570fae69be 100644
GIT binary patch
delta 600
zcmWmBU1(Ba7zc2U?x^S3d#1~DXFKY!hJv+nyC_;s`h?oDY|NmWE{cL$Y~8hrsLZ-)
z6h`e-td%qwG2F(2S7N2mQqWAI#`<s|6iks2YpaWP(cg=g-+BMfa}E#Bxs|-me88E^
zbunZ**EN%22$dTcN01>m<KqmCk1JL#GGu7Rp|qg%)uG&`LCNS+;?z*1i`{V_`H>{s
zsX|*Q!~Vtf!FzT<V<Uv{K0~|XYP0*wr^{}VAC0B|5O?C4Hde|vxlyJq^K3th7ar%>
z?p?5ARV8oW`_Zt9M#Jj-Zam8+HI+-6<9ks5w~1RXLi>JhsuO;`$6cs_haYn7n2QdE
zxYmO(R^e_}>z?g=mVstBzwCr{XZXrFs9fL|v@l=bH_pS_xVF9x+J9>^X}I)y)#5Su
z%|glpm?0$-nvw-Ak8Ca^d>3GJN}zVw_eD6bgNsE$(Tm<<Pc1F>=sNn5*%LZjb*206
z>K~clkLUWQO7sLGdYn2Mh^+2=f_%wiV7zd7#2_c&;K?;R-=Z(;G}5fov|>Y+_L!0i
zWI?Zq2EFyZpU4UwV&W9`9tn%p-}5dk(zR&ur$p*cHEj5ZY;w5q#b$V7u90)Wvnq-1
zh3gJT1`clVNiVm;Uw5QetqMYhCf-O#apz{GiPJFJVorBM|21=Sb@Z`-nT`c4v!lp*
Yoz_d$wHMl~>O-iN{Z?A`Hw};c2fN+ZF8}}l

delta 471
zcmV;|0Vw{_$Akfl$Akf}+)T6GOuWsvni>Hpl83{r0k^}f0{nZIz$gPAx8EoOJP3yz
zF$0GjF$A|9F$F=Ew_e8uO9q#!%?0<jqRs_*2$vq$1su0M*9C9|x31g;Q$x1`AO^>V
zhsve~x5}mm;6#V3>j$^1>j+~-w+}H1EE%^vN(r$`x9*h*dIYy=nh84yx22*9GEcYI
z@d=Mhw`e^I&jGhMKMM6Lw=Qc6@o~2x-3r|cxBln~FW0v&zzY~Nw@32}&C9nHzYOPJ
zxBVUs?|Fyqm<_k>m<|gHxA~$D;|{mou@1K<x0Trrco4S^>J9>IhY?l}w-HtlK5(~C
z#t<USw{w#bn-{kas}Z3Chq0~^hq0~_x3R7hZ=km!PZR-Bw<Dkwn8vrfW)(ukhyN=U
zxBn{_{35sfP8Y`lhs04Ax5QBxR_(VNKN-en9tzAVr#pLR2tQoOf<FQdoxhG1roB|*
zN58w69zPSe0jC+aBZs-l8MnF08ZFbe=ban0H@BSC8woMDrUo3hMz>x~925z+b5<O>
zI=3#79KAA^?ZX^ew@AbsuWGmWE*;BLx5R=SB?E`*g&nu*g&xGEx34Q7d<eHJG#>|0
NhctvAw={$xou8R9&XoWF