1
0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-01 02:03:32 +00:00

Core - Drop old brush entity when changing to a new brush

Core - Properly save brush entity sub-groups
This commit is contained in:
Robert 2022-05-03 21:18:10 +02:00
parent cce8404cfa
commit b2987b5190
2 changed files with 7 additions and 2 deletions

View File

@ -790,7 +790,8 @@ namespace Artemis.Core
{ {
General.BrushReference.SetCurrentValue(layerBrush != null ? new LayerBrushReference(layerBrush.Descriptor) : null, null); General.BrushReference.SetCurrentValue(layerBrush != null ? new LayerBrushReference(layerBrush.Descriptor) : null, null);
LayerBrush = layerBrush; LayerBrush = layerBrush;
LayerEntity.LayerBrush = new LayerBrushEntity();
if (LayerBrush != null) if (LayerBrush != null)
ActivateLayerBrush(); ActivateLayerBrush();
else else

View File

@ -231,14 +231,18 @@ namespace Artemis.Core
internal void ApplyToEntity() internal void ApplyToEntity()
{ {
if (!PropertiesInitialized) if (!PropertiesInitialized || PropertyGroupEntity == null)
return; return;
foreach (ILayerProperty layerProperty in LayerProperties) foreach (ILayerProperty layerProperty in LayerProperties)
layerProperty.Save(); layerProperty.Save();
PropertyGroupEntity.PropertyGroups.Clear();
foreach (LayerPropertyGroup layerPropertyGroup in LayerPropertyGroups) foreach (LayerPropertyGroup layerPropertyGroup in LayerPropertyGroups)
{
layerPropertyGroup.ApplyToEntity(); layerPropertyGroup.ApplyToEntity();
PropertyGroupEntity.PropertyGroups.Add(layerPropertyGroup.PropertyGroupEntity);
}
} }
internal void Update(Timeline timeline) internal void Update(Timeline timeline)