Merge pull request #244 from Unity-Technologies/fix-all-warnings

Fix all warnings

MaterialGraphProject/Assets/NewNodes/Editor/ChannelBlendNode.cs

-using UnityEditor.Graphing;
-using System.Linq;
-using System.Collections;
-
 namespace UnityEditor.ShaderGraph
 {
     /*  [Title("Art", "ChannelBlend")]

MaterialGraphProject/Assets/NewNodes/Editor/FunctionNAddNode.cs

-using UnityEditor.Graphing;
-using System.Linq;
-using System.Collections;
-
 namespace UnityEditor.ShaderGraph
 {
     /*  [Title("Math", "Advanced", "Adder")]

MaterialGraphProject/Assets/NewNodes/Editor/FunctionNInNOut.cs

-using UnityEditor.Graphing;
-using System.Linq;
-using System.Collections;
 using System;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Keep/ColorBalanceNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Keep/ConvolutionFilterNode.cs

-using UnityEditor.Graphing;
-using System.Collections.Generic;
-using System.Linq;
 using System;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Keep/CustomCodeNode.cs

 using System;
-using UnityEditor.Graphing;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/Keep/GradientWrapper.cs

 using UnityEngine;
-using UnityEditor;
-
-using System.Reflection;
-
-using Activator = System.Activator;
-using Array = System.Array;
 using Type = System.Type;
 
 [System.Serializable]

MaterialGraphProject/Assets/NewNodes/Editor/Keep/IFNode.cs

 using System;
-using System.Reflection;
-using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/Keep/LevelsNode.cs

-using UnityEditor.Graphing;
-using System.Collections.Generic;
-using System.Reflection;
+
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/Keep/MakeSubgraph/FractalNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Keep/MakeSubgraph/HexNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Keep/MakeSubgraph/ParticleNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Keep/ParallaxNode.cs

 using UnityEngine;
-using UnityEditor.Graphing;
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/Keep/UVTriPlanar.cs

-using UnityEditor.Graphing;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace UnityEditor.ShaderGraph
 {
     /* [Title("UV", "Tri-Planar Mapping")]

MaterialGraphProject/Assets/NewNodes/Editor/Keep/VertexInterpolatorNode.cs

 using UnityEngine;
-using UnityEditor.Graphing;
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/Kill/AACheckerBoard3dNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Kill/GradientRampNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Kill/LineNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Kill/MultiLayerParallaxNode.cs

 using UnityEngine;
-using UnityEditor.Graphing;
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/Kill/POMNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Kill/PulseNode.cs

-using System.Reflection;
+
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/Kill/ScatterNode.cs

-using UnityEditor.Graphing;
-
 namespace UnityEditor.ShaderGraph
 {
     /*  [Title("Procedural", "Scatter")]

MaterialGraphProject/Assets/NewNodes/Editor/Kill/SphericalIndentationNode.cs

-using System.Reflection;
 using UnityEngine;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Kill/SpherizeNode.cs

-using System.Reflection;
 using UnityEngine;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Kill/ToggleNode.cs

-using UnityEditor.Graphing;
-
 namespace UnityEditor.ShaderGraph
 {
     /* [Title("Input", "Toggle")]

MaterialGraphProject/Assets/NewNodes/Editor/Kill/UVPannerNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Kill/UVTileNode.cs

-using System.Reflection;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/Kill/UVTransform.cs

-using System.Reflection;
-using UnityEditor.ShaderGraph.Drawing.Controls;
-using UnityEditor.Graphing;
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/Sampler2DShaderProperty.cs

 using System;
-using System.Text;
 using UnityEngine;
 
 /*namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/NewNodes/Editor/SceneDepthNode.cs

-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
-using System.Collections.Generic;
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/SceneNormalsNode.cs

-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
-using System.Collections.Generic;
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/NewNodes/Editor/SceneVelocityNode.cs

-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
-using System.Collections.Generic;
 
 /*namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/AssetCallbacks/CreateShaderSubGraph.cs

 using System.IO;
 using UnityEditor.ProjectWindowCallback;
-using UnityEditor.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/AbstractMaterialGraphAsset.cs

-using System.Linq;
-using UnityEditor.Graphing;
-
 namespace UnityEditor.ShaderGraph
 {
 }

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/IMaterialGraphAsset.cs

-using UnityEditor.Graphing;
-
 namespace UnityEditor.ShaderGraph
 {
 }

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/MatrixShaderProperty.cs

 using System;
-using System.Text;
 using UnityEngine;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/NormalMaterialSlot.cs

 using System;
-using UnityEditor.Graphing;
 using UnityEngine;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/PositionMaterialSlot.cs

 using System;
-using UnityEditor.Graphing;
 using UnityEngine;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/TangentMaterialSlot.cs

 using System;
-using UnityEditor.Graphing;
 using UnityEngine;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Graphs/ViewDirectionMaterialSlot.cs

 using System;
-using UnityEditor.Graphing;
 using UnityEngine;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/GraphObject.cs

 using System;
-using UnityEditor;
 using UnityEngine;
 
 namespace UnityEditor.Graphing

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/NeededCoordinateSpace.cs

 using System;
-using System.Linq;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/LightweightPipeline/LightweightFastBlinnMasterNode.cs

 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
+
 namespace UnityEditor.ShaderGraph
 {
     [Title("Artistic", "Filter", "Dither")]

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Artistic/Normal/NormalCreateNode.cs

 using System.Linq;
 using UnityEngine;
 using UnityEditor.Graphing;
-using System.Collections.Generic;
-using UnityEditor.ShaderGraph.Drawing.Slots;
-using UnityEngine.Experimental.UIElements;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Artistic/Normal/NormalStrengthNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Channel/CombineNode.cs

 using System;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Channel/SplitNode.cs

 using System;
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEditor.Graphing;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Basic/ConstantNode.cs

 using System.Collections.Generic;
 using UnityEditor.ShaderGraph.Drawing.Controls;
 using UnityEngine;
-using UnityEditor.ShaderGraph;
 using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Geometry/ScreenPositionNode.cs

-using System.Reflection;
 using UnityEngine;
 using UnityEditor.Graphing;
 using UnityEditor.ShaderGraph.Drawing.Controls;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/PBR/MetalReflectanceNode.cs

-using System.Reflection;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor.Graphing;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/PropertyNode.cs

 using System;
 using System.Linq;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 using UnityEngine;
 using UnityEditor.Graphing;
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Basic/MultiplyNode.cs

 using System;
 using System.Collections.Generic;
 using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Slots;
-using UnityEngine.Experimental.UIElements;
 using System.Linq;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Derivative/DDXNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.ShaderGraph.Drawing.Controls;
-using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Derivative/DDXYNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.ShaderGraph.Drawing.Controls;
-using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Derivative/DDYNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.ShaderGraph.Drawing.Controls;
-using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Matrix/MatrixConstructionNode.cs

 using System;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 using UnityEditor.Graphing;
 using UnityEditor.ShaderGraph.Drawing.Controls;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Matrix/MatrixSplitNode.cs

 using System;
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEditor.Graphing;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Round/StepNode.cs

-using System.Linq.Expressions;
 using System.Reflection;
 
 namespace UnityEditor.ShaderGraph

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/UV/TwirlNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/AllNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/AndNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/AnyNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/BranchNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/IsInfiniteNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/IsNanNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/NandNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/NotNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Utility/Logic/OrNode.cs

 using System.Reflection;
 using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Drawing.Controls;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/CubemapPropertyChunk.cs

 using System;
-using System.Text;
 
 namespace UnityEditor.ShaderGraph
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/Logging.cs

 using System;
 using UnityEngine;
-using Object = System.Object;
 
 namespace UnityEditor.Graphing
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/SerializationHelper.cs

 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 
 namespace UnityEditor.Graphing

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Blackboard/BlackboardField.cs

             if (dropTarget == null || !dropTarget.CanAcceptDrop(selection))
                 return;
 
-            var propagation = EventPropagation.Continue;
-                propagation = dropTarget.DragUpdated(evt, selection, dropTarget);
+                dropTarget.DragUpdated(evt, selection, dropTarget);
-                propagation = dropTarget.DragPerform(evt, selection, dropTarget);
+                dropTarget.DragPerform(evt, selection, dropTarget);
-                propagation = dropTarget.DragExited();
+                dropTarget.DragExited();
 
 //            if (propagation == EventPropagation.Stop)
 //                evt.StopPropagation();

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Blackboard/BlackboardProvider.cs

 {
     class BlackboardProvider
     {
-        readonly string m_AssetName;
         readonly AbstractMaterialGraph m_Graph;
         readonly Texture2D m_ExposedIcon;
         readonly Dictionary<Guid, BlackboardRow> m_PropertyRows;
 
         public BlackboardProvider(string assetName, AbstractMaterialGraph graph)
         {
-            m_AssetName = assetName;
             m_Graph = graph;
             m_ExposedIcon = Resources.Load("GraphView/Nodes/BlackboardFieldExposed") as Texture2D;
             m_PropertyRows = new Dictionary<Guid, BlackboardRow>();

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Blackboard/BlackboardSection.cs

 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Controls/ChannelMixerControl.cs

 using System;
 using System.Reflection;
-using UnityEditor.Experimental.UIElements;
-using UnityEngine.Experimental.UIElements.StyleSheets;
-using UnityEditor.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph.Drawing.Controls
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Controls/ColorControl.cs

 using UnityEditor.Experimental.UIElements;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
-using UnityEngine.Experimental.UIElements.StyleSheets;
-using UnityEditor.ShaderGraph;
 using Color = UnityEditor.ShaderGraph.ColorNode.Color;
 
 namespace UnityEditor.ShaderGraph.Drawing.Controls

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Controls/CubemapControl.cs

 using UnityEditor.Experimental.UIElements;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
-using UnityEngine.Experimental.UIElements.StyleSheets;
-using UnityEditor.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph.Drawing.Controls
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Controls/SliderControl.cs

 
     public class SliderControlView : VisualElement, INodeModificationListener
     {
-        GUIContent m_Label;
         AbstractMaterialNode m_Node;
         PropertyInfo m_PropertyInfo;
         bool m_DisplayMinMax;
         VisualElement m_SliderPanel;
         Slider m_Slider;
         FloatField m_SliderInput;
-        FloatField m_MinField;
-        FloatField m_MaxField;
 
         public SliderControlView(string label, bool displayMinMax, AbstractMaterialNode node, PropertyInfo propertyInfo)
         {
 
             if (propertyInfo.PropertyType != typeof(Vector3))
                 throw new ArgumentException("Property must be of type Vector3.", "propertyInfo");
-            m_Label = new GUIContent(label ?? ObjectNames.NicifyVariableName(propertyInfo.Name));
+            new GUIContent(label ?? ObjectNames.NicifyVariableName(propertyInfo.Name));
             m_Value = (Vector3)m_PropertyInfo.GetValue(m_Node, null);
 
             m_SliderPanel = new VisualElement { name = "SliderPanel" };
             if(m_DisplayMinMax)
             {
                 var fieldsPanel = new VisualElement { name = "FieldsPanel" };
-                m_MinField = AddField(fieldsPanel, "Min", 1, m_Value);
-                m_MaxField = AddField(fieldsPanel, "Max", 2, m_Value);
+                AddField(fieldsPanel, "Min", 1, m_Value);
+                AddField(fieldsPanel, "Max", 2, m_Value);
                 Add(fieldsPanel);
             }
         }

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Controls/TextureControl.cs

 using UnityEditor.Experimental.UIElements;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
-using UnityEngine.Experimental.UIElements.StyleSheets;
-using UnityEditor.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph.Drawing.Controls
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Controls/ToggleControl.cs

 using System;
 using System.Reflection;
 using UnityEditor.Graphing;
-using UnityEditor.Experimental.UIElements;
-using UnityEngine.Experimental.UIElements.StyleSheets;
-using UnityEditor.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph.Drawing.Controls
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Controls/VectorControl.cs

 using UnityEditor.Experimental.UIElements;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
-using UnityEngine.Experimental.UIElements.StyleSheets;
-using UnityEditor.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph.Drawing.Controls
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/MasterPreviewView.cs

 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using UnityEditor.Graphing;
+using UnityEngine.Experimental.UIElements.StyleSheets;
 using Object = UnityEngine.Object;
 
 namespace UnityEditor.ShaderGraph.Drawing.Inspector
+        PreviewManager m_PreviewManager;
-        PreviewTextureView m_PreviewTextureView;
+        Image m_PreviewTextureView;
 
         Vector2 m_PreviewScrollPosition;
         ObjectField m_PreviewMeshPicker;
         public MasterPreviewView(string assetName, PreviewManager previewManager, AbstractMaterialGraph graph)
         {
             this.clippingOptions = ClippingOptions.ClipAndCacheContents;
+            m_PreviewManager = previewManager;
-            m_PreviewRenderHandle.onPreviewChanged += OnPreviewChanged;
 
             var topContainer = new VisualElement() { name = "top" };
             {
 
             var middleContainer = new VisualElement {name = "middle"};
             {
-                m_PreviewTextureView = new PreviewTextureView { name = "preview", image = Texture2D.blackTexture };
-                m_PreviewTextureView.AddManipulator(new Draggable(OnMouseDragPreviewMesh, true));
-                m_PreviewTextureView.AddManipulator((IManipulator)Activator.CreateInstance(s_ContextualMenuManipulator, (Action<ContextualMenuPopulateEvent>)BuildContextualMenu));
-
-                middleContainer.Add(m_PreviewTextureView);
-
+                m_PreviewTextureView = CreatePreview(Texture2D.blackTexture);
-
-
+            m_PreviewRenderHandle.onPreviewChanged += OnPreviewChanged;
+        Image CreatePreview(Texture texture)
+        {
+            var image = new Image { name = "preview", image = StyleValue<Texture>.Create(m_PreviewRenderHandle.texture ?? texture) };
+            image.AddManipulator(new Draggable(OnMouseDragPreviewMesh, true));
+            image.AddManipulator((IManipulator)Activator.CreateInstance(s_ContextualMenuManipulator, (Action<ContextualMenuPopulateEvent>)BuildContextualMenu));
+            return image;
+        }
+
         void BuildContextualMenu(ContextualMenuPopulateEvent evt)
         {
             foreach (var primitiveTypeName in Enum.GetNames(typeof(PrimitiveType)))
 
         void OnPreviewChanged()
         {
-            m_PreviewTextureView.image = m_PreviewRenderHandle.texture ?? Texture2D.blackTexture;
+            m_PreviewTextureView.image = StyleValue<Texture>.Create(m_PreviewRenderHandle.texture ?? Texture2D.blackTexture);
             m_PreviewTextureView.Dirty(ChangeType.Repaint);
         }
 
 
         public void RefreshRenderTextureSize()
         {
-            RenderTextureDescriptor descriptor = m_PreviewRenderHandle.renderTexture.descriptor;
+            var currentWidth = m_PreviewRenderHandle.texture != null ? m_PreviewRenderHandle.texture.width : -1;
+            var currentHeight = m_PreviewRenderHandle.texture != null ? m_PreviewRenderHandle.texture.height : -1;
-            if (Mathf.Approximately(descriptor.width, targetHeight) && Mathf.Approximately(descriptor.height, targetWidth))
-            {
+            if (Mathf.Approximately(currentWidth, targetHeight) && Mathf.Approximately(currentHeight, targetWidth))
-            }
-            descriptor.width = (int)m_PreviewTextureView.contentRect.width;
-            descriptor.height = (int)m_PreviewTextureView.contentRect.height;
-
-            m_PreviewRenderHandle.renderTexture.Release();
-            Object.DestroyImmediate(m_PreviewRenderHandle.renderTexture);
-            m_PreviewRenderHandle.renderTexture = new RenderTexture(descriptor) { hideFlags = HideFlags.HideAndDontSave };
-
-            DirtyMasterNode(ModificationScope.Node);
+            m_PreviewManager.ResizeMasterPreview(m_PreviewTextureView.contentRect.size);
         }
 
         public void UpdateRenderTextureOnNextLayoutChange()

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Manipulators/Draggable.cs

 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Manipulators/GraphDropTarget.cs

 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor.Experimental.UIElements.GraphView;
-using UnityEditor.MemoryProfiler;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
 using Object = UnityEngine.Object;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Manipulators/ResizeBorderFrame.cs

 using System;
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Manipulators/ResizeSideHandle.cs

 using System;
-using System.Collections.Generic;
-using System.Xml;
-using UnityEngine.EventSystems;
 using UnityEngine.Experimental.UIElements;
 
 namespace UnityEditor.ShaderGraph.Drawing

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Manipulators/Scrollable.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.Experimental.UIElements;
 using System;
 

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Manipulators/WindowDraggable.cs

 using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+ using UnityEngine;
-using UnityEditor.Experimental.UIElements;
 
 namespace UnityEditor.ShaderGraph.Drawing
 {

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

 using System.Linq;
 using System.Text;
 using UnityEditor.Experimental.UIElements;
-using UnityEditor.Experimental.UIElements.GraphView;
-using UnityEngine.Assertions;
-using UnityEditor.ShaderGraph;
 using Object = UnityEngine.Object;
 using Edge = UnityEditor.Experimental.UIElements.GraphView.Edge;
 

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

 using System;
-using System.Collections.Generic;
-using UnityEditor.ShaderGraph;
 using UnityEngine.Rendering;
 using UnityEngine.SceneManagement;
 

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

         Texture2D m_ErrorTexture;
         Shader m_UberShader;
         string m_OutputIdName;
+        Vector2? m_NewMasterPreviewSize;
 
         public PreviewRenderData masterRenderData
         {
             {
                 renderTexture = new RenderTexture(400, 400, 16, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Default) { hideFlags = HideFlags.HideAndDontSave }
             };
+            m_MasterRenderData.renderTexture.Create();
+        public void ResizeMasterPreview(Vector2 newSize)
+        {
+            m_NewMasterPreviewSize = newSize;
+            m_DirtyPreviews.Add(masterRenderData.shaderData.node.tempId.index);
+        }
+
         public PreviewRenderData GetPreview(AbstractMaterialNode node)
         {
             return m_RenderDatas[node.tempId.index];
                 shaderData = shaderData,
                 renderTexture = new RenderTexture(200, 200, 16, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Default) { hideFlags = HideFlags.HideAndDontSave }
             };
+            renderData.renderTexture.Create();
             Set(m_Identifiers, node.tempId, node.tempId);
             Set(m_RenderDatas, node.tempId, renderData);
             m_DirtyShaders.Add(node.tempId.index);
             var renderMasterPreview = masterRenderData.shaderData != null && m_DirtyPreviews.Contains(masterRenderData.shaderData.node.tempId.index);
             if (renderMasterPreview)
             {
+                if (m_NewMasterPreviewSize.HasValue)
+                {
+                    if (masterRenderData.renderTexture != null)
+                        Object.DestroyImmediate(masterRenderData.renderTexture, true);
+                    masterRenderData.renderTexture = new RenderTexture((int)m_NewMasterPreviewSize.Value.x, (int)m_NewMasterPreviewSize.Value.y, 16, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Default) { hideFlags = HideFlags.HideAndDontSave };
+                    masterRenderData.renderTexture.Create();
+                    masterRenderData.texture = masterRenderData.renderTexture;
+                    m_NewMasterPreviewSize = null;
+                }
                 var mesh = m_Graph.previewData.serializedMesh.mesh ? m_Graph.previewData.serializedMesh.mesh :  m_SceneResources.sphere;
                 var previewTransform = Matrix4x4.Rotate(m_Graph.previewData.rotation);
                 var scale = m_Graph.previewData.scale;

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

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using UnityEditor.Experimental.UIElements;
 using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEditor.Graphing;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/GradientEdge.cs

 using UnityEditor.Experimental.UIElements.GraphView;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements.StyleSheets;
-using UnityEditor.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph.Drawing
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/GraphEditorView.cs

     {
         public WindowDockingLayout previewLayout = new WindowDockingLayout();
         public WindowDockingLayout blackboardLayout = new WindowDockingLayout();
-
-        [NonSerialized]
-        public WindowDockingLayout defaultPreviewLayout = new WindowDockingLayout();
-
-        [NonSerialized]
-        public WindowDockingLayout defaultBlackboardLayout = new WindowDockingLayout();
+        public Vector2 masterPreviewSize = new Vector2(400, 400);
     }
 
     public class GraphEditorView : VisualElement, IDisposable
         EdgeConnectorListener m_EdgeConnectorListener;
         BlackboardProvider m_BlackboardProvider;
 
-        string m_FloatingWindowsLayoutKey;
+        const string k_FloatingWindowsLayoutKey = "UnityEditor.ShaderGraph.FloatingWindowsLayout";
         FloatingWindowsLayout m_FloatingWindowsLayout;
 
         public Action saveRequested { get; set; }
             AddStyleSheetPath("Styles/GraphEditorView");
             m_EditorWindow = editorWindow;
             previewManager = new PreviewManager(graph);
+            string serializedWindowLayout = EditorUserSettings.GetConfigValue(k_FloatingWindowsLayoutKey);
+            if (!string.IsNullOrEmpty(serializedWindowLayout))
+            {
+                m_FloatingWindowsLayout = JsonUtility.FromJson<FloatingWindowsLayout>(serializedWindowLayout);
+                if (m_FloatingWindowsLayout.masterPreviewSize.x > 0f && m_FloatingWindowsLayout.masterPreviewSize.y > 0f)
+                    previewManager.ResizeMasterPreview(m_FloatingWindowsLayout.masterPreviewSize);
+            }
+            previewManager.RenderPreviews();
 
             var toolbar = new IMGUIContainer(() =>
             {
                 {
                     if (showInProjectRequested != null)
                         showInProjectRequested();
-                }
-                GUILayout.Space(6);
-                if (GUILayout.Button("Reset Layout", EditorStyles.toolbarButton))
-                {
-                    m_MasterPreviewView.layout = m_FloatingWindowsLayout.defaultPreviewLayout.GetLayout(layout);
-                    m_BlackboardProvider.blackboard.layout = m_FloatingWindowsLayout.defaultBlackboardLayout.GetLayout(layout);
-                    m_MasterPreviewView.UpdateRenderTextureOnNextLayoutChange();
-                    UpdateSerializedWindowLayout();
                 }
                 GUILayout.FlexibleSpace();
                 GUILayout.EndHorizontal();
         {
             UnregisterCallback<PostLayoutEvent>(ApplySerializewindowLayouts);
 
-            m_FloatingWindowsLayoutKey = "UnityEditor.ShaderGraph.FloatingWindowsLayout";
-            string serializedWindowLayout = EditorUserSettings.GetConfigValue(m_FloatingWindowsLayoutKey);
-
-            if (!String.IsNullOrEmpty(serializedWindowLayout))
+            if (m_FloatingWindowsLayout != null)
-                m_FloatingWindowsLayout = JsonUtility.FromJson<FloatingWindowsLayout>(serializedWindowLayout);
-
-                m_FloatingWindowsLayout.defaultPreviewLayout.CalculateDockingCornerAndOffset(m_MasterPreviewView.layout, layout);
-                m_FloatingWindowsLayout.defaultBlackboardLayout.CalculateDockingCornerAndOffset(m_BlackboardProvider.blackboard.layout, layout);
-
-                m_MasterPreviewView.UpdateRenderTextureOnNextLayoutChange();
+                previewManager.ResizeMasterPreview(m_FloatingWindowsLayout.masterPreviewSize);
-                m_FloatingWindowsLayout.defaultPreviewLayout.CalculateDockingCornerAndOffset(m_MasterPreviewView.layout, layout);
-                m_FloatingWindowsLayout.defaultBlackboardLayout.CalculateDockingCornerAndOffset(m_BlackboardProvider.blackboard.layout, layout);
+            if (m_FloatingWindowsLayout == null)
+                m_FloatingWindowsLayout = new FloatingWindowsLayout();
+            m_FloatingWindowsLayout.masterPreviewSize = m_MasterPreviewView.Q("preview").layout.size;
-            EditorUserSettings.SetConfigValue(m_FloatingWindowsLayoutKey, serializedWindowLayout);
+            EditorUserSettings.SetConfigValue(k_FloatingWindowsLayoutKey, serializedWindowLayout);
 
             m_MasterPreviewView.RefreshRenderTextureSize();
         }

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

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using UnityEditor.ShaderGraph;
-using MouseButton = UnityEngine.Experimental.UIElements.MouseButton;
 
 namespace UnityEditor.ShaderGraph.Drawing
 {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/PortInputView.cs

 using System;
-using UnityEditor.Experimental.UIElements;
-using UnityEditor.Graphing;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
 using UnityEngine.Experimental.UIElements.StyleSheets;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/Slots/BooleanSlotControlView.cs

 using System;
-using UnityEditor.Experimental.UIElements;
 using UnityEditor.Graphing;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/Slots/CubemapSlotControlView.cs

 using UnityEditor.Graphing;
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
-using UnityEngine.Experimental.UIElements.StyleSheets;
 using Object = UnityEngine.Object;
 
 namespace UnityEditor.ShaderGraph.Drawing.Slots

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/Slots/LabelSlotControlView.cs

 using System;
-using UnityEditor.Experimental.UIElements;
-using UnityEditor.Graphing;
-using UnityEngine.Experimental.UIElements.StyleSheets;
-using Object = UnityEngine.Object;
 
 namespace UnityEditor.ShaderGraph.Drawing.Slots
 {