From b2987b5190587c3e606e3ada5a794ab22af930c2 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 3 May 2022 21:18:10 +0200 Subject: [PATCH] Core - Drop old brush entity when changing to a new brush Core - Properly save brush entity sub-groups --- src/Artemis.Core/Models/Profile/Layer.cs | 3 ++- src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Artemis.Core/Models/Profile/Layer.cs b/src/Artemis.Core/Models/Profile/Layer.cs index 67493f42b..fc5bcb991 100644 --- a/src/Artemis.Core/Models/Profile/Layer.cs +++ b/src/Artemis.Core/Models/Profile/Layer.cs @@ -790,7 +790,8 @@ namespace Artemis.Core { General.BrushReference.SetCurrentValue(layerBrush != null ? new LayerBrushReference(layerBrush.Descriptor) : null, null); LayerBrush = layerBrush; - + LayerEntity.LayerBrush = new LayerBrushEntity(); + if (LayerBrush != null) ActivateLayerBrush(); else diff --git a/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs b/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs index 6a80f1ac8..fc4159ef8 100644 --- a/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs +++ b/src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs @@ -231,14 +231,18 @@ namespace Artemis.Core internal void ApplyToEntity() { - if (!PropertiesInitialized) + if (!PropertiesInitialized || PropertyGroupEntity == null) return; foreach (ILayerProperty layerProperty in LayerProperties) layerProperty.Save(); + PropertyGroupEntity.PropertyGroups.Clear(); foreach (LayerPropertyGroup layerPropertyGroup in LayerPropertyGroups) + { layerPropertyGroup.ApplyToEntity(); + PropertyGroupEntity.PropertyGroups.Add(layerPropertyGroup.PropertyGroupEntity); + } } internal void Update(Timeline timeline)