OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Catch meshing error in Meshmerizer" 

This reverts commit 8f2986bc6a.

In favor of a fix that tells us where the issue is instead of eating the error
avinationmerge
Melanie Thielker 2010-08-03 05:25:01 +02:00
parent ecfea5fa69
commit d2d1c63b17
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -336,8 +336,6 @@ namespace OpenSim.Region.Physics.Meshing
bool mirror = ((primShape.SculptType & 128) != 0); bool mirror = ((primShape.SculptType & 128) != 0);
bool invert = ((primShape.SculptType & 64) != 0); bool invert = ((primShape.SculptType & 64) != 0);
try
{
sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, false, mirror, invert); sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, false, mirror, invert);
idata.Dispose(); idata.Dispose();
@ -349,12 +347,6 @@ namespace OpenSim.Region.Physics.Meshing
coords = sculptMesh.coords; coords = sculptMesh.coords;
faces = sculptMesh.faces; faces = sculptMesh.faces;
} }
catch(Exception ex)
{
m_log.Error("[Meshing]: Unable to generate a Sculpty mesh. " + ex.Message);
return null;
}
}
else else
{ {
float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f; float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;