merge with main again

Author: HenryLi-0

subsystems/interface.py

@@ -185,7 +185,7 @@ def tick(self,mx,my,mPressed,fps,keyQueue,mouseScroll):
                     if key in KB_EDITOR_VISUAL_OFFSET_RIGHT: self.graphOffset += (self.graphScale+0.000001)
                     if 1152<self.mx and 36<self.my and self.mx<1340 and self.my<245:
                         if key in KB_DELETE:
-                            self.sprites[self.selectedSprite].removeImage(math.floor(((self.mx-1152)+2*(self.my-36)-2*self.apperancePanelOffset-6)/90))
+                            self.sprites[self.selectedSprite].removeImageUUID(math.floor(((self.mx-1152)+2*(self.my-36)-2*self.apperancePanelOffset-6)/90))
                 if key in KB_TIMELINE_OFFSET_LEFT:  self.timelineOffset -= (self.timelineScale+0.000001)
                 if key in KB_TIMELINE_OFFSET_RIGHT: self.timelineOffset += (self.timelineScale+0.000001)
             else:

subsystems/render.py

@@ -76,7 +76,7 @@ def rotateDegHundred(img: numpy.ndarray, cent:float):
 
 def setSize(img: numpy.ndarray, size):
     '''Returns a copy of the given image scaled by size, given the size change (given with 50 as normal, >50 scale up, <50 scale down)'''
-    x, y, temp = img.shape
+    y, x, temp = img.shape
     return numpy.array(Image.fromarray(img).resize((max(1, (round(x*(size/50)**2))),max(1, round(y*(size/50)**2)))))
 
 def setColorEffect(img: numpy.ndarray, colorEffect):