Merge pull request #6461 from Gillibald/fixes/OpacityMask

Gillibald · danwalmsley · commit d12d992c8d77 · 2021-10-08T16:07:35.000+01:00
Prevent DeferredRenderer crash when a VisualBrush is used as OpacityMask
diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
@@ -279,13 +279,13 @@ void IRenderLoopTask.Render()
         /// <inheritdoc/>
         Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
         {
-            return (_currentDraw.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;
+            return (_currentDraw?.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;
         }
 
         /// <inheritdoc/>
         void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)
         {
-            var childScene = (_currentDraw.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual];
+            var childScene = (_currentDraw?.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual];
 
             if (childScene != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -279,13 +279,13 @@ void IRenderLoopTask.Render()`
`279`	`279`	`/// <inheritdoc/>`
`280`	`280`	`Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)`
`281`	`281`	`{`
`282`		`- return (_currentDraw.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;`
	`282`	`+ return (_currentDraw?.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual]?.Size ?? Size.Empty;`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`/// <inheritdoc/>`
`286`	`286`	`void IVisualBrushRenderer.RenderVisualBrush(IDrawingContextImpl context, IVisualBrush brush)`
`287`	`287`	`{`
`288`		`- var childScene = (_currentDraw.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual];`
	`288`	`+ var childScene = (_currentDraw?.Item as BrushDrawOperation)?.ChildScenes?[brush.Visual];`
`289`	`289`
`290`	`290`	`if (childScene != null)`
`291`	`291`	`{`