DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-11 19:36:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #294 from SpoinkyNL/development

Browse Source 
1.8.0.2
This commit is contained in:
Robert Beekman authored and GitHub committed 2017-01-26 13:40:47 +01:00
2 parents 4e2f852bcb f7b61f11c0
commit f912804746
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Artemis/Artemis/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -53,7 +53,7 @@ using System.Windows;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.0.0")] [assembly: AssemblyVersion("1.8.0.2")]
[assembly: AssemblyFileVersion("1.8.0.0")] [assembly: AssemblyFileVersion("1.8.0.2")]
[assembly: InternalsVisibleTo("Artemis.Explorables")] [assembly: InternalsVisibleTo("Artemis.Explorables")]
Artemis/Artemis/ViewModels/Profiles/LayerConditionViewModel.cs
+2 -2
View File
@@ -221,15 +221,15 @@ namespace Artemis.ViewModels.Profiles
return; return;
if (SelectedDataModelProp.Type == "Boolean") if (SelectedDataModelProp.Type == "Boolean")
{
EnumValueIsVisible = true; EnumValueIsVisible = true;
}
else if (SelectedDataModelProp.EnumValues != null) else if (SelectedDataModelProp.EnumValues != null)
{ {
Enums.Clear(); Enums.Clear();
Enums.AddRange(SelectedDataModelProp.EnumValues); Enums.AddRange(SelectedDataModelProp.EnumValues);
EnumValueIsVisible = true; EnumValueIsVisible = true;
} }
else
UserValueIsVisible = true;
} }
/// <summary> /// <summary>