Skip to content
Snippets Groups Projects
Commit cdf74574 authored by biwa's avatar biwa
Browse files

Texture sets now work with textures from a directory or PK3/PK7 (it matches...

Texture sets now work with textures from a directory or PK3/PK7 (it matches against the short 8 character name)
parent 0a6ee07b
No related branches found
No related tags found
No related merge requests found
...@@ -140,7 +140,7 @@ namespace CodeImp.DoomBuilder.Config ...@@ -140,7 +140,7 @@ namespace CodeImp.DoomBuilder.Config
internal bool AddTexture(ImageData image) internal bool AddTexture(ImageData image)
{ {
// Check against regex // Check against regex
if(regex.IsMatch(image.Name.ToUpperInvariant())) if(regex.IsMatch(image.ShortName.ToUpperInvariant()))
{ {
// Matches! Add it. // Matches! Add it.
textures.Add(image); textures.Add(image);
...@@ -158,7 +158,7 @@ namespace CodeImp.DoomBuilder.Config ...@@ -158,7 +158,7 @@ namespace CodeImp.DoomBuilder.Config
internal bool AddFlat(ImageData image) internal bool AddFlat(ImageData image)
{ {
// Check against regex // Check against regex
if(regex.IsMatch(image.Name.ToUpperInvariant())) if(regex.IsMatch(image.ShortName.ToUpperInvariant()))
{ {
// Matches! Add it. // Matches! Add it.
flats.Add(image); flats.Add(image);
...@@ -174,7 +174,7 @@ namespace CodeImp.DoomBuilder.Config ...@@ -174,7 +174,7 @@ namespace CodeImp.DoomBuilder.Config
// This only checks if the given image is a match // This only checks if the given image is a match
internal bool IsMatch(ImageData image) internal bool IsMatch(ImageData image)
{ {
return regex.IsMatch(image.Name.ToUpperInvariant()); return regex.IsMatch(image.ShortName.ToUpperInvariant());
} }
// This only checks if the given texture name is a match (mxd) // This only checks if the given texture name is a match (mxd)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment