Layer brushes - Make enable-disable process consistent with plugins

src/Artemis.Core/Services/Interfaces/ILayerService.cs

@@ -22,11 +22,5 @@ namespace Artemis.Core.Services.Interfaces
         /// <param name="layer">The layer to instantiate the brush for</param>
         /// <returns></returns>
         BaseLayerBrush InstantiateLayerBrush(Layer layer);
-
-        /// <summary>
-        /// Removes the layer brush from the provided layer and disposes it
-        /// </summary>
-        /// <param name="layer"></param>
-        void RemoveLayerBrush(Layer layer);
     }
 }

src/Artemis.Core/Services/LayerService.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Profile;
+using Artemis.Core.Plugins.Abstract;
 using Artemis.Core.Plugins.LayerBrush;
 using Artemis.Core.Services.Interfaces;
 using Ninject;
@@ -40,8 +41,8 @@ namespace Artemis.Core.Services
 
         public BaseLayerBrush InstantiateLayerBrush(Layer layer)
         {
-            RemoveLayerBrush(layer);
-
+            layer.DeactivateLayerBrush();
+           
             var descriptorReference = layer.General.BrushReference?.CurrentValue;
             if (descriptorReference == null)
                 return null;
@@ -66,17 +67,5 @@ namespace Artemis.Core.Services
             layer.OnLayerBrushUpdated();
             return layer.LayerBrush;
         }
-
-        public void RemoveLayerBrush(Layer layer)
-        {
-            if (layer.LayerBrush == null)
-                return;
-
-            var brush = layer.LayerBrush;
-            layer.LayerBrush = null;
-            brush.Dispose();
-
-            layer.LayerEntity.PropertyEntities.RemoveAll(p => p.PluginGuid == brush.PluginInfo.Guid);
-        }
     }
 }