Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 0 insertions, 9 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index f8966b729..57c1aa724 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -42,13 +42,6 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _materials = value; RaisePropertyChangedAuto(); }
         }
 
-        private ObservableCollection<MediaColor> _colors;
-        public ObservableCollection<MediaColor> Colors
-        {
-            get { return _colors; }
-            set { _colors = value; RaisePropertyChangedAuto(); }
-        }
-
         private ObservableCollection<MediaPurpos> _purposes;
         public ObservableCollection<MediaPurpos> Purposes
         {
@@ -265,7 +258,6 @@ namespace Tango.MachineStudio.RML.ViewModels
         private void LoadRmlProperties()
         {
             Materials = _active_context.MediaMaterials.ToObservableCollection();
-            Colors = _active_context.MediaColors.ToObservableCollection();
             Purposes = _active_context.MediaPurposes.ToObservableCollection();
             Conditions = _active_context.MediaConditions.ToObservableCollection();
             LinearMassDensityUnits = _active_context.LinearMassDensityUnits.ToObservableCollection();
@@ -303,7 +295,6 @@ namespace Tango.MachineStudio.RML.ViewModels
                     rml.Manufacturer = "Twine";
                     rml.Code = Rmls.Max(x => x.Code) + 1;
                     rml.MediaMaterial = Materials.FirstOrDefault();
-                    rml.MediaColor = Colors.FirstOrDefault();
                     rml.MediaPurpose = Purposes.FirstOrDefault();
                     rml.MediaCondition = Conditions.FirstOrDefault();
                     rml.LinearMassDensityUnit = LinearMassDensityUnits.FirstOrDefault();