Skip to content

[ShaderGraph] [2021.2] Fix "view shader" commands to not block Unity from closing, use same editor instance #5736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2021
Merged

[ShaderGraph] [2021.2] Fix "view shader" commands to not block Unity from closing, use same editor instance #5736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.shadergraph/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed the ordering of inputs on a SubGraph node to match the properties on the blackboard of the subgraph itself [1366052]
- Fixed Parallax Occlusion Mapping node to handle non-uniformly scaled UVs such as HDRP/Lit POM [1347008].
- Fixed ShaderGraph HDRP master preview disappearing for a few seconds when graph is modified [1330289] (https://issuetracker.unity3d.com/issues/shadergraph-hdrp-main-preview-is-invisible-until-moved)
- Fixed an issue where ShaderGraph "view shader" commands were opening in individual windows, and blocking Unity from closing [1367188]

## [11.0.0] - 2020-10-21

Expand Down
23 changes: 1 addition & 22 deletions com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,26 +362,6 @@ public static bool WriteToFile(string path, string content)
}
}

static ProcessStartInfo CreateProcessStartInfo(string filePath)
{
string externalScriptEditor = ScriptEditorUtility.GetExternalScriptEditor();

ProcessStartInfo psi = new ProcessStartInfo();
psi.UseShellExecute = false;


#if UNITY_EDITOR_OSX
string arg = string.Format("-a \"{0}\" -n --args \"{1}\"", externalScriptEditor, Path.GetFullPath(filePath));
psi.FileName = "open";
psi.Arguments = arg;
#else
psi.Arguments = Path.GetFileName(filePath);
psi.WorkingDirectory = Path.GetDirectoryName(filePath);
psi.FileName = externalScriptEditor;
#endif
return psi;
}

public static void OpenFile(string path)
{
string filePath = Path.GetFullPath(path);
Expand All @@ -394,8 +374,7 @@ public static void OpenFile(string path)
string externalScriptEditor = ScriptEditorUtility.GetExternalScriptEditor();
if (externalScriptEditor != "internal")
{
ProcessStartInfo psi = CreateProcessStartInfo(filePath);
Process.Start(psi);
InternalEditorUtility.OpenFileAtLineExternal(filePath, 0);
}
else
{
Expand Down