Add names to property nodes in the editor

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

         {
             get
             {
-                yield return new TypeMapping(typeof(AbstractSurfaceMasterNode), typeof(SurfaceMasterNodeInspector));
+				yield return new TypeMapping(typeof(AbstractSurfaceMasterNode), typeof(SurfaceMasterNodeInspector));
+				yield return new TypeMapping(typeof(PropertyNode), typeof(PropertyNodeInspector));
                 yield return new TypeMapping(typeof(SubGraphInputNode), typeof(SubgraphInputNodeInspector));
                 yield return new TypeMapping(typeof(SubGraphOutputNode), typeof(SubgraphOutputNodeInspector));
             }

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

             m_Graph.AddNode(m_PropertyNode);
         }
 
-        [Test]
+      /*  [Test]
         public void TestExposedPropertyReturnsRawName()
         {
             m_PropertyNode.exposedState = PropertyNode.ExposedState.Exposed;
             m_Vector2Node.ValidateNode();
             Assert.IsFalse(m_Vector1Node.hasError);
             Assert.IsFalse(m_Vector2Node.hasError);
-        }
+        }*/
 
         [Test]
         public void TestPropertyExposedOnSubgraphReturnsFalse()

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

         }
 
         [SerializeField]
-        private string m_PropertyName = string.Empty;
-
-        [SerializeField]
         private string m_Description = string.Empty;
 
         [SerializeField]
         {
             get
             {
-                if (string.IsNullOrEmpty(m_Description))
-                    return m_PropertyName;
-
-                return m_Description;
+				return  string.IsNullOrEmpty(m_Description) ? name : m_Description;
             }
             set { m_Description = value; }
         }
             get
             {
-                if (exposedState == ExposedState.NotExposed || string.IsNullOrEmpty(m_PropertyName))
-
-                return m_PropertyName + "_Uniform";
-            set { m_PropertyName = value; }
         }
 
         public abstract PropertyType propertyType { get; }

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/NodeInspectors/PropertyNodeInspector.cs

+using UnityEditor.Graphing.Drawing;
+using UnityEngine;
+using UnityEngine.Graphing;
+using UnityEngine.MaterialGraph;
+
+namespace UnityEditor.MaterialGraph.Drawing
+{
+	public class PropertyNodeInspector : BasicNodeInspector
+	{
+		public override void OnInspectorGUI()
+		{
+			base.OnInspectorGUI();
+
+			var propertyNode = node as PropertyNode;
+			if (propertyNode == null)
+				return;
+
+			GUILayout.Label("Settings", EditorStyles.boldLabel);
+
+			EditorGUI.BeginChangeCheck();
+
+			//propertyNode.name = EditorGUILayout.TextField ("Name", propertyNode.name);
+			propertyNode.description = EditorGUILayout.TextField ("Description", propertyNode.description);
+
+			if (EditorGUI.EndChangeCheck())
+				node.onModified(node, ModificationScope.Node);
+		}
+	}
+}

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/NodeInspectors/PropertyNodeInspector.cs.meta

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