update to latest canvas2d branch

Signed-off-by: joce <joce@unity3d.com>

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/AbstractGraphEditWindow.cs

             if (Selection.activeObject is ScriptableObject)
             {
                 var selection = Selection.activeObject as T;
-                if (selection != m_LastSelection)
+                if (selection!= null && selection != m_LastSelection)
                 {
                     var graph = selection.graph;
                     graph.OnEnable();

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Drawer/TitleBarButtonDrawer.cs

 
             m_label.content.text = m_dataProvider.text;
 
-            this.Touch(ChangeType.Repaint);
+            this.Dirty(ChangeType.Repaint);
         }
 
         void OnClick()
                 AddToClassList("active");
             else if (newState == ClickerState.Inactive)
                 RemoveFromClassList("active");
-            this.Touch(ChangeType.Repaint);
+            this.Dirty(ChangeType.Repaint);
         }
 
         protected override object toWatch

MaterialGraphProject/ProjectSettings/GraphicsSettings.asset

 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 10
+  serializedVersion: 11
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  m_CustomRenderPipeline: {fileID: 0}
-  m_TierSettings_Tier1:
-    renderingPath: 1
-    hdrMode: 1
-    useCascadedShadowMaps: 1
-    useHDR: 1
-  m_TierSettings_Tier2:
-    renderingPath: 1
-    hdrMode: 1
-    useCascadedShadowMaps: 1
-    useHDR: 1
-  m_TierSettings_Tier3:
-    renderingPath: 1
-    hdrMode: 1
-    useCascadedShadowMaps: 1
-    useHDR: 1
+  m_InstancingStripping: 0
-  m_LightmapKeepDirSeparate: 1
-  m_LightmapKeepDynamicDirSeparate: 1
+  m_LightmapKeepShadowMask: 1
+  m_LightmapKeepSubtractive: 1
+  m_LightsUseLinearIntensity: 0
+  m_LightsUseCCT: 0

MaterialGraphProject/ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 5.6.0b4
+m_EditorVersion: 5.6.0b6

MaterialGraphProject/Assets/GraphView.meta

+fileFormatVersion: 2
+guid: 0ec39c50d1bcd624b8f2dd329881127d
+folderAsset: yes
+timeCreated: 1485805545
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MaterialGraphProject/Assets/GraphView/Editor.meta

+fileFormatVersion: 2
+guid: 9635695807dafd94992e8eb6a9346b63
+folderAsset: yes
+timeCreated: 1485805545
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: