Fix merge issues.

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

 
  /*
 
- namespace UnityEngine.MaterialGraph
+ namespace UnityEditor.ShaderGraph
  {
      [Title("UV/Tri-Planar Mapping")]
      public class UVTriPlanar : FunctionNInNOut, IGeneratesFunction, IMayRequireNormal, IMayRequireWorldPosition

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class BitangentMaterialSlot : Vector3MaterialSlot, IMayRequireBitangent
             return space.ToNeededCoordinateSpace();
         }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class DynamicVectorMaterialSlot : MaterialSlot, IMaterialSlotHasVaule<Vector4>
 
         protected override string ConcreteSlotValueAsVariable(AbstractMaterialNode.OutputPrecision precision)
         {
-            return precision + "4 (" + value.x + "," + value.y + "," + value.z + "," + value.w + ")"; 
+            return precision + "4 (" + value.x + "," + value.y + "," + value.z + "," + value.w + ")";
-}
+}

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

-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     public interface IMaterialSlotHasVaule<T>
     {
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class Matrix2MaterialSlot : MaterialSlot
             :base(slotId, displayName, shaderOutputName, slotType, shaderStage, hidden)
         {
         }
-        
+
         protected override string ConcreteSlotValueAsVariable(AbstractMaterialNode.OutputPrecision precision)
         {
             return precision + "2x2 (1,0,0,1)";
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Matrix2; } }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class Matrix3MaterialSlot : MaterialSlot
         public override SlotValueType valueType { get { return SlotValueType.Matrix3; } }
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Matrix3; } }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class Matrix4MaterialSlot : MaterialSlot
         public override SlotValueType valueType { get { return SlotValueType.Matrix4; } }
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Matrix4; } }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class NormalMaterialSlot : Vector3MaterialSlot, IMayRequireNormal
             return space.ToNeededCoordinateSpace();
         }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class PositionMaterialSlot : Vector3MaterialSlot, IMayRequirePosition
             return space.ToNeededCoordinateSpace();
         }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class SamplerStateMaterialSlot : MaterialSlot
         public override SlotValueType valueType { get { return SlotValueType.SamplerState; } }
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.SamplerState; } }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class ScreenPositionMaterialSlot : Vector4MaterialSlot, IMayRequireScreenPosition
             return !isConnected;
         }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class TangentMaterialSlot : Vector3MaterialSlot, IMayRequireTangent
             return space.ToNeededCoordinateSpace();
         }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class Texture2DMaterialSlot : MaterialSlot
         public override SlotValueType valueType { get { return SlotValueType.Texture2D; } }
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Texture2D; } }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class UVMaterialSlot : Vector2MaterialSlot, IMayRequireMeshUV
             return m_Channel == channel;
         }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class Vector1MaterialSlot : MaterialSlot, IMaterialSlotHasVaule<float>
             return pp;
         }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class Vector2MaterialSlot : MaterialSlot, IMaterialSlotHasVaule<Vector2>
 
         [SerializeField]
         private Vector2 m_DefaultValue;
-        
+
-        {
-        }
+        {}
 
         public Vector2MaterialSlot(
             int slotId,
         public override SlotValueType valueType { get { return SlotValueType.Vector2; } }
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Vector2; } }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class Vector3MaterialSlot : MaterialSlot, IMaterialSlotHasVaule<Vector3>
 
         [SerializeField]
         private Vector3 m_DefaultValue;
-        
+
         public Vector3MaterialSlot()
         {
         }
         {
             return precision + "3 (" + value.x + "," + value.y + "," + value.z + ")";
         }
+
         public override PreviewProperty GetPreviewProperty(string name)
         {
             var pp = new PreviewProperty
         public override SlotValueType valueType { get { return SlotValueType.Vector3; } }
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Vector3; } }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class Vector4MaterialSlot : MaterialSlot, IMaterialSlotHasVaule<Vector4>
         public override SlotValueType valueType { get { return SlotValueType.Vector4; } }
         public override ConcreteSlotValueType concreteValueType { get { return ConcreteSlotValueType.Vector4; } }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class VertexColorMaterialSlot : Vector4MaterialSlot, IMayRequireScreenPosition
             return !isConnected;
         }
     }
-}
+}

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

 using System;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
+using UnityEngine;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public class ViewDirectionMaterialSlot : Vector3MaterialSlot, IMayRequireViewDirection
             return space.ToNeededCoordinateSpace();
         }
     }
-}
+}

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Art/Filters/ConvolutionFilterNode.cs

 using System.Linq;
 using System;
 
-/*namespace UnityEngine.MaterialGraph
+/*namespace UnityEditor.ShaderGraph
 {
     [Title("Art/Filters/Convolution")]
     public class ConvolutionFilterNode : Function2Input, IGeneratesFunction, IGeneratesBodyCode, IMayRequireMeshUV

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/CodeFunctionNode.cs

                 defaultValue = new Vector4(defaultX, defaultY, defaultZ, defaultW);
             }
         }
-        
+
         protected abstract MethodInfo GetFunctionToConvert();
 
         private static SlotValueType ConvertTypeToSlotValueType(ParameterInfo p)
                 binding |= slot.RequiresNormal();
             return binding;
         }
-        
+
         public NeededCoordinateSpace RequiresViewDirection()
         {
             var binding = NeededCoordinateSpace.None;
 
         public bool RequiresMeshUV(UVChannel channel)
         {
-            var binding = NeededCoordinateSpace.None;
             foreach (var slot in GetInputSlots<MaterialSlot>().OfType<IMayRequireMeshUV>())
             {
                 if (slot.RequiresMeshUV(channel))

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SurfaceModel/ProjectSpecificMasterNode.cs

 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using UnityEngine.Graphing;
+using UnityEditor.Graphing;
-namespace UnityEngine.MaterialGraph
+namespace UnityEditor.ShaderGraph
 {
     [Serializable]
     public abstract class ProjectSpecificMasterNode : AbstractMasterNode