Move yaml removals to the end of the merge.
This commit is contained in:
committed by
Oliver Brakmann
parent
a074bb1d4b
commit
c7249e6fa6
@@ -23,10 +23,11 @@ namespace OpenRA.Graphics
|
||||
{
|
||||
units = new Dictionary<string, Dictionary<string, Voxel>>();
|
||||
|
||||
var sequences = voxelFiles
|
||||
var partial = voxelFiles
|
||||
.Select(s => MiniYaml.FromFile(s))
|
||||
.Aggregate(voxelNodes, MiniYaml.MergePartial);
|
||||
|
||||
var sequences = MiniYaml.ApplyRemovals(partial);
|
||||
foreach (var s in sequences)
|
||||
LoadVoxelsForUnit(s.Key, s.Value);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user