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

mantis 8442 more changes to alpha blending (mono does not like last)

0.9.1.0-post-fixes
UbitUmarov 2019-01-18 03:02:39 +00:00
parent 0c85517e9e
commit 04f44bcf99
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
View File

@ -362,24 +362,15 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
{ {
bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb); bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
graph = Graphics.FromImage(bitmap); graph = Graphics.FromImage(bitmap);
using (SolidBrush bgFillBrush = new SolidBrush(bgColor)) graph.Clear(bgColor);
{
graph.FillRectangle(bgFillBrush, 0, 0, width, height);
}
} }
else else
{ {
Color newbg = Color.FromArgb(alpha, bgColor);
bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
graph = Graphics.FromImage(bitmap); graph = Graphics.FromImage(bitmap);
graph.Clear(newbg);
Color newbg = Color.FromArgb(alpha,bgColor);
using (SolidBrush bgFillBrush = new SolidBrush(newbg))
{
graph.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceCopy;
graph.FillRectangle(bgFillBrush, 0, 0, width, height);
}
} }
graph.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceOver;
GDIDraw(data, graph, altDataDelim, out reuseable); GDIDraw(data, graph, altDataDelim, out reuseable);
} }

2
OpenSim/Region/Framework/Scenes/UuidGatherer.cs
View File

@ -450,6 +450,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
// scan thru the dynAttrs map of this part for any textures used as materials // scan thru the dynAttrs map of this part for any textures used as materials
OSD osdMaterials = null; OSD osdMaterials = null;
if(part.DynAttrs == null)
return;
lock (part.DynAttrs) lock (part.DynAttrs)
{ {