Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-01 20:26:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove layer null check

Browse Source 
Move to the place that triggered the null
This commit is contained in:
Kurt
2020-10-30 19:56:16 -07:00
parent a33120c93e
commit 80a5d8e451
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Drawing/ImageUtil.cs
View File

@@ -16,10 +16,8 @@ public static Bitmap LayerImage(Image baseLayer, Image overLayer, int x, int y,
return LayerImage(baseLayer, overLayer, x, y);
}
public static Bitmap LayerImage(Image? baseLayer, Image overLayer, int x, int y)
public static Bitmap LayerImage(Image baseLayer, Image overLayer, int x, int y)
{
if (baseLayer is null)
return (Bitmap)overLayer;
Bitmap img = new Bitmap(baseLayer);
using Graphics gr = Graphics.FromImage(img);
gr.DrawImage(overLayer, x, y, overLayer.Width, overLayer.Height);

3
PKHeX.WinForms/Controls/SAV Editor/BitmapAnimator.cs
View File

@@ -108,7 +108,8 @@ private Image GetFrame(int frameIndex)
frame = ImageUtil.GetBitmap(frameData, imgWidth, imgHeight);
if (ExtraLayer != null)
frame = ImageUtil.LayerImage(frame, ExtraLayer, 0, 0);
frame = ImageUtil.LayerImage(OriginalBackground, frame, 0, 0);
if (OriginalBackground != null)
frame = ImageUtil.LayerImage(OriginalBackground, frame, 0, 0);
return GlowCache[frameIndex] = frame;
}