Fixed a bug in initialisation auto copying where missing properties w…

…ould cause a nullreferenceexception Signed-off-by: Martin Evans <martindevans@gmail.com>
TomGillen · Feb 24, 2014 · 42bb91c · 42bb91c
1 parent 57ae177
commit 42bb91c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/Myre/Myre.Debugging.UI/Properties/AssemblyInfo.cs b/Myre/Myre.Debugging.UI/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
diff --git a/Myre/Myre.Debugging/Properties/AssemblyInfo.cs b/Myre/Myre.Debugging/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
diff --git a/Myre/Myre.Entities/Entity.cs b/Myre/Myre.Entities/Entity.cs
@@ -234,7 +234,7 @@ internal void Initialise(INamedDataProvider initialisationData)
                 foreach (var item in initialisationData)
                 {
                     var prop = GetProperty(item.Key);
-                    if (prop.Type.IsAssignableFrom(item.Value.Type))
+                    if (prop != null && prop.Type.IsAssignableFrom(item.Value.Type))
                         prop.Value = item.Value.Value;
                 }
             }

diff --git a/Myre/Myre.Entities/Properties/AssemblyInfo.cs b/Myre/Myre.Entities/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.2.3")]
+[assembly: AssemblyVersion("1.2.4")]
diff --git a/Myre/Myre.Graphics.Pipeline/Properties/AssemblyInfo.cs b/Myre/Myre.Graphics.Pipeline/Properties/AssemblyInfo.cs
@@ -28,4 +28,4 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1")]
+[assembly: AssemblyVersion("1.1.1")]
diff --git a/Myre/Myre.Graphics/Properties/AssemblyInfo.cs b/Myre/Myre.Graphics/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyVersion("1.1.3")]
diff --git a/Myre/Myre.StateManagement/Properties/AssemblyInfo.cs b/Myre/Myre.StateManagement/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
diff --git a/Myre/Myre.UI/Properties/AssemblyInfo.cs b/Myre/Myre.UI/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
diff --git a/Myre/Myre/Properties/AssemblyInfo.cs b/Myre/Myre/Properties/AssemblyInfo.cs
@@ -27,6 +27,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.0.1")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("MyreTests")]