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

discard alpha in 4-plane sculpt textures before generating physics proxy mesh

link-sitting
dahlia 2013-11-01 01:40:56 -07:00
parent cc73ef4eb9
commit f4ded3af63
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -629,21 +629,16 @@ namespace OpenSim.Region.Physics.Meshing
try try
{ {
OpenMetaverse.Imaging.ManagedImage unusedData; OpenMetaverse.Imaging.ManagedImage managedImage;
OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out unusedData, out idata);
if (idata == null) OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage);
{
// In some cases it seems that the decode can return a null bitmap without throwing
// an exception
m_log.WarnFormat("[PHYSICS]: OpenJPEG decoded sculpt data for {0} to a null bitmap. Ignoring.", primName);
return false; if ((managedImage.Channels & OpenMetaverse.Imaging.ManagedImage.ImageChannels.Alpha) != 0)
} managedImage.ConvertChannels(managedImage.Channels & ~OpenMetaverse.Imaging.ManagedImage.ImageChannels.Alpha);
unusedData = null; Bitmap imgData = OpenMetaverse.Imaging.LoadTGAClass.LoadTGA(new MemoryStream(managedImage.ExportTGA()));
idata = (Image)imgData;
//idata = CSJ2K.J2kImage.FromBytes(primShape.SculptData); managedImage = null;
if (cacheSculptMaps) if (cacheSculptMaps)
{ {