stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Linedef info panel: texture preview was not updated in some cases.

Browse source 
Visual mode: fixed major slowdowns and possible out of memory exceptions when viewing a map with lots of missing textures.
This commit is contained in:
MaxED 2013-08-05 13:46:43 +00:00
parent 3890c4a7c8
commit f35e39de01
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Controls/LinedefInfoPanel.cs
View file

@ -438,6 +438,8 @@ namespace CodeImp.DoomBuilder.Controls
// Determine image to show
if(required)
General.DisplayZoomedImage(panel, Properties.Resources.MissingTexture);
else
panel.BackgroundImage = null;
}
else
{

12
Source/Core/Data/DataManager.cs
View file

@ -78,6 +78,7 @@ namespace CodeImp.DoomBuilder.Data
// Special images
private ImageData missingtexture3d;
private ImageData unknowntexture3d;
private UnknownImage unknownImage; //mxd
private ImageData hourglass3d;
private ImageData crosshair;
private ImageData crosshairbusy;
@ -168,6 +169,7 @@ namespace CodeImp.DoomBuilder.Data
whitetexture.UseColorCorrection = false;
whitetexture.LoadImage();
whitetexture.CreateTexture();
unknownImage = new UnknownImage(Properties.Resources.UnknownImage); //mxd. There should be only one!
}
// Disposer
@ -190,6 +192,8 @@ namespace CodeImp.DoomBuilder.Data
crosshairbusy = null;
whitetexture.Dispose();
whitetexture = null;
unknownImage.Dispose(); //mxd
unknownImage = null; //mxd
modeldefEntries = null;//mxd
mapInfo = null;
@ -916,7 +920,7 @@ namespace CodeImp.DoomBuilder.Data
}
// Return null image
return new UnknownImage(Properties.Resources.UnknownImage);
return unknownImage; //mxd
}
#endregion
@ -1008,7 +1012,7 @@ namespace CodeImp.DoomBuilder.Data
}
// Return null image
return new UnknownImage(Properties.Resources.UnknownImage);
return unknownImage; //mxd
}
// This returns an image by long and doesn't check if it exists
@ -1173,7 +1177,7 @@ namespace CodeImp.DoomBuilder.Data
}
else
{
return new UnknownImage(Properties.Resources.UnknownImage);
return unknownImage; //mxd
}
}
else
@ -1214,7 +1218,7 @@ namespace CodeImp.DoomBuilder.Data
else
{
// Return null image
return new UnknownImage(Properties.Resources.UnknownImage);
return unknownImage; //mxd
}
}
}