stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 22:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a rare crash when pasting a thing that has a model assigned to another map

Browse source
This commit is contained in:
biwa 2021-06-26 22:20:39 +02:00
parent 70f0c22f72
commit 62d9da0e73
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/Core/Data/ImageData.cs
View file

@ -274,14 +274,19 @@ namespace CodeImp.DoomBuilder.Data
public void LoadImageNow() public void LoadImageNow()
{ {
if (imagestate != ImageLoadState.Ready) LoadImageNow(true);
{
imagestate = ImageLoadState.Loading;
LoadImage(true);
}
} }
internal void BackgroundLoadImage() public void LoadImageNow(bool notify)
{
if (imagestate != ImageLoadState.Ready)
{
imagestate = ImageLoadState.Loading;
LoadImage(notify);
}
}
internal void BackgroundLoadImage()
{ {
LoadImage(true); LoadImage(true);
} }

6
Source/Core/GZBuilder/md3/ModelReader.cs
View file

@ -277,7 +277,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
if (General.Map.Data.GetTextureExists(name)) if (General.Map.Data.GetTextureExists(name))
{ {
ImageData image = General.Map.Data.GetTextureImage(name); ImageData image = General.Map.Data.GetTextureImage(name);
image.LoadImageNow(); image.LoadImageNow(false);
t = image.Texture; t = image.Texture;
@ -294,7 +294,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
if (General.Map.Data.GetTextureExists(name)) if (General.Map.Data.GetTextureExists(name))
{ {
ImageData image = General.Map.Data.GetTextureImage(name); ImageData image = General.Map.Data.GetTextureImage(name);
image.LoadImageNow(); image.LoadImageNow(false);
t = image.Texture; t = image.Texture;
} }
@ -308,7 +308,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
if (General.Map.Data.GetSpriteExists(name)) if (General.Map.Data.GetSpriteExists(name))
{ {
ImageData image = General.Map.Data.GetSpriteImage(name); ImageData image = General.Map.Data.GetSpriteImage(name);
image.LoadImageNow(); image.LoadImageNow(false);
t = image.Texture; t = image.Texture;
} }