ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

add null texture entry face check before converting legacy materials

Browse Source
This commit is contained in:
dahlia
2014-01-20 11:53:33 -08:00
parent 4800303abd
commit 1cae3664a5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
View File

@@ -199,7 +199,7 @@ namespace OpenSim.Region.OptionalModules.Materials
bool used = false;
foreach (var face in te.FaceTextures)
if (face.MaterialID == id)
if (face != null && face.MaterialID == id)
used = true;
if (used)
@@ -207,7 +207,7 @@ namespace OpenSim.Region.OptionalModules.Materials
var newId = StoreMaterialAsAsset(part.CreatorID, material, part);
foreach (var face in te.FaceTextures)
if (face.MaterialID == id)
if (face != null && face.MaterialID == id)
face.MaterialID = newId;
}
}