From 00c1c3512592a3c09b84958d855008c37c535a61 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 17 Jan 2020 22:42:59 +0100
Subject: [PATCH] Go direct to property store.

To avoid a call to `VerifyAccess` (which shows up when profiling).
---
 src/Avalonia.Base/AvaloniaObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index e0fa93c341..023594de9a 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -431,7 +431,7 @@ namespace Avalonia
             Optional<T> oldValue,
             Optional<T> newValue)
         {
-            if (property.Inherits && !IsSet(property))
+            if (property.Inherits && (_values == null || !_values.IsSet(property)))
             {
                 RaisePropertyChanged(property, oldValue, newValue, BindingPriority.LocalValue);
             }