Merge pull request #7814 from Phrohdoh/default-image

Image reference in 'Defaults' sequence block.
2015-04-03 10:36:29 +02:00
parent 39b42a35a0 32083344aa
commit de2860358f
2 changed files with 10 additions and 7 deletions
--- a/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
+++ b/OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
@@ -36,6 +36,9 @@ namespace OpenRA.Mods.Common.Graphics
 			{
 				nodes.Remove("Defaults");
 				nodes = nodes.ToDictionary(kv => kv.Key, kv => MiniYaml.MergeStrict(kv.Value, defaults));
+
+				foreach (var n in nodes)
+					n.Value.Value = n.Value.Value ?? defaults.Value;
 			}

 			foreach (var kvp in nodes)