[mat graph]Move material options into the master node they exist for + add GUID support for selected master node.

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/DrawData/NodePreviewDrawData.cs

                 var shaderName = "Hidden/PreviewShader/" + localNode.GetVariableNameForNode();
                 List<PropertyGenerator.TextureInfo> defaultTextures;
                 //TODO: Need to get the real options somehow
-                var resultShader =  ((AbstractMasterNode) m_Node).GetShader(new MaterialOptions(), GenerationMode.Preview, out defaultTextures);
+                var resultShader =  ((AbstractMasterNode) m_Node).GetShader(GenerationMode.Preview, out defaultTextures);
                 m_GeneratedShaderMode = PreviewMode.Preview3D;
                 return resultShader;
             }

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphView.cs

                 return null;
 
             List<PropertyGenerator.TextureInfo> configuredTextures;
-            var shaderString = materialGraph.masterNode.GetShader(new MaterialOptions(), GenerationMode.ForReals, out configuredTextures);
+            var shaderString = materialGraph.masterNode.GetShader(GenerationMode.ForReals, out configuredTextures);
             File.WriteAllText(path, shaderString);
             AssetDatabase.Refresh(); // Investigate if this is optimal
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Testing/IntegrationTests/ShaderGenerationTest.cs

 
             // Generate the shader
             List<PropertyGenerator.TextureInfo> configuredTextures;
-            var shaderString = materialGraph.masterNode.GetShader(graphAsset.options, GenerationMode.ForReals, out configuredTextures);
+            var shaderString = materialGraph.masterNode.GetShader(GenerationMode.ForReals, out configuredTextures);
             m_Shader = ShaderUtil.CreateShaderAsset(shaderString);
             m_Shader.hideFlags = HideFlags.HideAndDontSave;
             Assert.IsNotNull(m_Shader, "Shader Generation Failed");

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Testing/UnitTests/MaterialGraphTests.cs

             var graph = new UnityEngine.MaterialGraph.MaterialGraph();
 
             Assert.IsNotNull(graph.currentGraph);
-            Assert.IsNotNull(graph.materialOptions);
 
             graph.PostCreate();
 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Graphs/MaterialGraph.cs

     public class MaterialGraph
     {
         [SerializeField]
-        private MaterialOptions m_MaterialOptions = new MaterialOptions();
-
-        [SerializeField]
         private PixelGraph m_PixelGraph;
 
         [SerializeField]
         {
             m_PixelGraph = new PixelGraph();
         }
-
-        public MaterialOptions materialOptions
-        {
-            get { return m_MaterialOptions; }
-        }
-
+        
         public AbstractMaterialGraph currentGraph
         {
             get { return m_PixelGraph; }

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Graphs/MaterialGraphAsset.cs

             get { return m_MaterialGraph.currentGraph; }
         }
 
-        public MaterialOptions options
-        {
-            get { return m_MaterialGraph.materialOptions; }
-        }
-
         public bool shouldRepaint
         {
             get { return graph.GetNodes<AbstractMaterialNode>().OfType<IRequiresTime>().Any(); }

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Graphs/PixelGraph.cs

 using System;
 using System.Linq;
+using UnityEngine.Graphing;
 
 namespace UnityEngine.MaterialGraph
 {
-        public AbstractMasterNode masterNode
+        [NonSerialized]
+        private Guid m_ActiveMasterNodeGUID;
+
+        [SerializeField]
+        private string m_ActiveMasterNodeGUIDSerialized;
+
+        public PixelGraph()
-            get { return GetNodes<AbstractMasterNode>().FirstOrDefault(); }
+            m_ActiveMasterNodeGUID = Guid.NewGuid();
+        }
+
+        public IMasterNode masterNode
+        {
+            get
+            {
+                var found = GetNodeFromGuid(m_ActiveMasterNodeGUID) as IMasterNode;
+                if (found != null)
+                    return found;
+
+                return GetNodes<IMasterNode>().FirstOrDefault();
+            }
+        }
+
+        public override void OnBeforeSerialize()
+        {
+            base.OnBeforeSerialize();
+
+            m_ActiveMasterNodeGUIDSerialized = m_ActiveMasterNodeGUID.ToString();
+        }
+        public override void OnAfterDeserialize()
+        {
+            base.OnAfterDeserialize();
+
+            if (!string.IsNullOrEmpty(m_ActiveMasterNodeGUIDSerialized))
+                m_ActiveMasterNodeGUID = new Guid(m_ActiveMasterNodeGUIDSerialized);
+            else
+                m_ActiveMasterNodeGUID = Guid.NewGuid();
         }
     }
 }

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/AbstractMasterNode.cs

 
 namespace UnityEngine.MaterialGraph
 {
-    interface IMasterNode
-    {
-        string GetShader(
-            MaterialOptions options,
-            GenerationMode mode,
-            out List<PropertyGenerator.TextureInfo> configuredTextures);
-    }
-
     [Serializable]
     public abstract class AbstractMasterNode : AbstractMaterialNode, IMasterNode
     {
             get { return true; }
         }
 
-        public abstract string GetShader(MaterialOptions options, GenerationMode mode, out List<PropertyGenerator.TextureInfo> configuredTextures);
+        public abstract string GetShader(GenerationMode mode, out List<PropertyGenerator.TextureInfo> configuredTextures);
     }
 }

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SurfaceModel/SurfaceMaterialOptions.cs

 namespace UnityEngine.MaterialGraph
 {
     [Serializable]
-    public class MaterialOptions
+    public class SurfaceMaterialOptions
     {
         public enum BlendMode
         {

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SurfaceModel/AbstractSurfaceMasterNode.cs

 namespace UnityEngine.MaterialGraph
 {
     [Serializable]
-    [Title("Math/Add Node")]
     public abstract class AbstractSurfaceMasterNode : AbstractMasterNode
     {
         public const string AlbedoSlotName = "Albedo";
         public const int OcclusionSlotId = 5;
         public const int AlphaSlotId = 6;
 
+        [SerializeField]
+        private SurfaceMaterialOptions m_MaterialOptions = new SurfaceMaterialOptions();
+
+        public SurfaceMaterialOptions options
+        {
+            get { return m_MaterialOptions; }
+        }
+
-            MaterialOptions options,
             GenerationMode mode,
             out List<PropertyGenerator.TextureInfo> configuredTextures)
         {
             var zTestVisitor = new ShaderGenerator();
             var zWriteVisitor = new ShaderGenerator();
 
-            options.GetTags(tagsVisitor);
-            options.GetBlend(blendingVisitor);
-            options.GetCull(cullingVisitor);
-            options.GetDepthTest(zTestVisitor);
-            options.GetDepthWrite(zWriteVisitor);
+            m_MaterialOptions.GetTags(tagsVisitor);
+            m_MaterialOptions.GetBlend(blendingVisitor);
+            m_MaterialOptions.GetCull(cullingVisitor);
+            m_MaterialOptions.GetDepthTest(zTestVisitor);
+            m_MaterialOptions.GetDepthWrite(zWriteVisitor);
 
             var resultShader = templateText.Replace("${ShaderName}", GetType() + guid.ToString());
             resultShader = resultShader.Replace("${ShaderPropertiesHeader}", shaderPropertiesVisitor.GetShaderString(2));

MaterialGraphProject/Assets/NewUI/Editor/Demo/GraphElements.meta

+fileFormatVersion: 2
+guid: 0cabc6d3555773b46ac210aaf8eefae6
+folderAsset: yes
+timeCreated: 1475167728
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/NewUI/Editor/Graph.meta

+fileFormatVersion: 2
+guid: b72798efa4aa8574ca0cbdfa63df0b7a
+folderAsset: yes
+timeCreated: 1475177616
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/NewUI/Editor/GraphElements.meta

+fileFormatVersion: 2
+guid: ebb7c69d632722145a1f9d838e7fe6ef
+folderAsset: yes
+timeCreated: 1475161005
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/NewUI/Editor/GraphElementsData.meta

+fileFormatVersion: 2
+guid: 3b224150c99d250429c73b1eefe3dd83
+folderAsset: yes
+timeCreated: 1475161005
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/GenerationMode.cs

+namespace UnityEngine.MaterialGraph
+{
+    public enum GenerationMode
+    {
+        Preview,
+        ForReals
+    }
+    public static class GenerationModeExtensions
+    {
+        public static bool IsPreview(this GenerationMode mode) { return mode == GenerationMode.Preview; }
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/GenerationMode.cs.meta

+fileFormatVersion: 2
+guid: 588ff2dc785e37f408eb9e48a18127d0
+timeCreated: 1480587334
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IGenerateProperties.cs

+namespace UnityEngine.MaterialGraph
+{
+    public interface IGenerateProperties
+    {
+        void GeneratePropertyBlock(PropertyGenerator visitor, GenerationMode generationMode);
+        void GeneratePropertyUsages(ShaderGenerator visitor, GenerationMode generationMode);
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IGenerateProperties.cs.meta

+fileFormatVersion: 2
+guid: bfce8626f6421204988af1303b24dcea
+timeCreated: 1480587334
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IGeneratesBodyCode.cs

+namespace UnityEngine.MaterialGraph
+{
+    public interface IGeneratesBodyCode
+    {
+        void GenerateNodeCode(ShaderGenerator visitor, GenerationMode generationMode);
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IGeneratesBodyCode.cs.meta

+fileFormatVersion: 2
+guid: 86155a20c88c9104cac95b7d74ae60dc
+timeCreated: 1480587334
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IGeneratesFunction.cs

+namespace UnityEngine.MaterialGraph
+{
+    public interface IGeneratesFunction
+    {
+        void GenerateNodeFunction(ShaderGenerator visitor, GenerationMode generationMode);
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IMasterNode.cs

+using System.Collections.Generic;
+using UnityEngine.Graphing;
+
+namespace UnityEngine.MaterialGraph
+{
+    public interface IMasterNode : INode
+    {
+        string GetShader(
+            GenerationMode mode,
+            out List<PropertyGenerator.TextureInfo> configuredTextures);
+
+        string GetVariableNameForNode();
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IMasterNode.cs.meta

+fileFormatVersion: 2
+guid: 01e757836230d8644aa3bf9bf23c714b
+timeCreated: 1480587334
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IRequiresTime.cs

+namespace UnityEngine.MaterialGraph
+{
+    public interface IRequiresTime
+    {
+    }
+}

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/IRequiresTime.cs.meta

+fileFormatVersion: 2
+guid: 275b56f32a48a0f4ab244ca9aa3884c9
+timeCreated: 1480587334
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SurfaceModel.meta

+fileFormatVersion: 2
+guid: 5b85f45ad1b4d8d4f8c69ebfbc08c3a1
+folderAsset: yes
+timeCreated: 1480587334
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/NewUI/Editor/Demo/GraphElements/Graph.meta

+fileFormatVersion: 2
+guid: f22bdd0720b76fb49a1a7d2461de982b
+folderAsset: yes
+timeCreated: 1475171334
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/NewUI/Editor/Demo/GraphElements/Nodes.meta

+fileFormatVersion: 2
+guid: 6f374239aa4eb8e46a84b48479605054
+folderAsset: yes
+timeCreated: 1475168121
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/NewUI/Editor/Graph/GraphElements.meta

+fileFormatVersion: 2
+guid: ea648af0e8d33db40905fd11df263507
+folderAsset: yes
+timeCreated: 1475177616
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/NewUI/Editor/GraphElements/Graph.meta

+fileFormatVersion: 2
+guid: 0fc31b1e188fa674d9c15b26b2598692
+folderAsset: yes
+timeCreated: 1475161005
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Interfaces/Interfaces.cs

-namespace UnityEngine.MaterialGraph
-{
-    public interface IRequiresTime
-    {
-    }
-
-    public enum GenerationMode
-    {
-        Preview,
-        ForReals
-    }
-
-    public static class GenerationModeExtensions
-    {
-        public static bool IsPreview(this GenerationMode mode) { return mode == GenerationMode.Preview; }
-    }
-
-    public interface IGeneratesBodyCode
-    {
-        void GenerateNodeCode(ShaderGenerator visitor, GenerationMode generationMode);
-    }
-
-    public interface IGeneratesFunction
-    {
-        void GenerateNodeFunction(ShaderGenerator visitor, GenerationMode generationMode);
-    }
-    
-    public interface IGenerateProperties
-    {
-        void GeneratePropertyBlock(PropertyGenerator visitor, GenerationMode generationMode);
-        void GeneratePropertyUsages(ShaderGenerator visitor, GenerationMode generationMode);
-    }
-}