···119119 }
120120 }
121121122122- private BlendingParameters effectBlending;
122122+ private BlendingParameters effectBlending = BlendingParameters.Inherit;
123123124124 /// <summary>
125125- /// The <see cref="BlendingParameters"/> to use after applying all effects. Default is <see cref="BlendingMode.Inherit"/>.
126126- /// <see cref="BlendingMode.Inherit"/> inherits the blending mode of the original, i.e. <see cref="Drawable.Blending"/> is used.
125125+ /// The <see cref="BlendingParameters"/> to use after applying all effects. Default is <see cref="BlendingType.Inherit"/>.
126126+ /// <see cref="BlendingType.Inherit"/> inherits the blending mode of the original, i.e. <see cref="Drawable.Blending"/> is used.
127127 /// Does not affect the original which is drawn when <see cref="DrawOriginal"/> is true.
128128 /// </summary>
129129 public BlendingParameters EffectBlending
···287287 {
288288 BlendingParameters blending = EffectBlending;
289289290290- if (blending.Mode == BlendingMode.Inherit)
291291- {
292292- blending.Mode = Blending.Mode;
293293- if (Blending.Mode == BlendingMode.Custom)
294294- blending.BlendingFactors = Blending.BlendingFactors; //in custom mode we also need to copy blending factor
295295- }
296296-297297- if (blending.RGBEquation == BlendingEquation.Inherit)
298298- blending.RGBEquation = Blending.RGBEquation;
299299-300300- if (blending.AlphaEquation == BlendingEquation.Inherit)
301301- blending.AlphaEquation = Blending.AlphaEquation;
290290+ blending.CopyFromParent(Blending);
291291+ blending.ApplyDefaultToInherited();
302292303293 return blending;
304294 }
···15561556 BlendingParameters localBlending = Blending;
1557155715581558 if (Parent != null)
15591559- {
15601560- if (localBlending.Mode == BlendingMode.Inherit)
15611561- {
15621562- localBlending.Mode = Parent.Blending.Mode;
15631563-15641564- if (Parent.Blending.Mode == BlendingMode.Custom)
15651565- localBlending.BlendingFactors = Parent.Blending.BlendingFactors; //copy blending settings from parent if custom
15661566- }
15671567-15681568- if (localBlending.RGBEquation == BlendingEquation.Inherit)
15691569- localBlending.RGBEquation = Parent.Blending.RGBEquation;
15591559+ localBlending.CopyFromParent(Parent.Blending);
1570156015711571- if (localBlending.AlphaEquation == BlendingEquation.Inherit)
15721572- localBlending.AlphaEquation = Parent.Blending.AlphaEquation;
15731573- }
15611561+ localBlending.ApplyDefaultToInherited();
1574156215751563 ci.Blending = localBlending;
15761564
+1-1
osu.Framework/Graphics/Effects/GlowEffect.cs
···3131 /// <summary>
3232 /// The blending mode of the glow. Default is additive.
3333 /// </summary>
3434- public BlendingParameters Blending = BlendingMode.Additive;
3434+ public BlendingParameters Blending = BlendingParameters.Additive;
35353636 /// <summary>
3737 /// Whether to draw the glow <see cref="EffectPlacement.InFront"/> or <see cref="EffectPlacement.Behind"/> the glowing
+1-1
osu.Framework/Graphics/Lines/Path_DrawNode.cs
···211211 GLWrapper.PushDepthInfo(DepthInfo.Default);
212212213213 // Blending is removed to allow for correct blending between the wedges of the path.
214214- GLWrapper.SetBlend(new BlendingParameters(BlendingMode.None));
214214+ GLWrapper.SetBlend(BlendingParameters.None);
215215216216 pathShader.Bind();
217217