Skip to content

Fix issue causing asset dependencies to be ignored #438

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 2 commits into from
Jun 9, 2020
Merged

Fix issue causing asset dependencies to be ignored #438

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cc0a52
Fix issue causing asset dependencies to be ignored
pbbastian May 13, 2020
a3f6a2f
[skip ci] Bump importer version for Hybrid as well
pbbastian May 13, 2020
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
4 changes: 2 additions & 2 deletions com.unity.shadergraph/Editor/Importers/ShaderGraphImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace UnityEditor.ShaderGraph
// This ifdef can be removed once V2 is the only option.
[ScriptedImporter(101, Extension, 3)]
#else
[ScriptedImporter(33, Extension, 3)]
[ScriptedImporter(34, Extension, 3)]
#endif

class ShaderGraphImporter : ScriptedImporter
Expand Down Expand Up @@ -173,7 +173,7 @@ internal static string GetShaderText(string path, out List<PropertyCollector.Tex
var generator = new Generator(graph, graph.outputNode, GenerationMode.ForReals, shaderName);
shaderString = generator.generatedShader;
configuredTextures = generator.configuredTextures;
sourceAssetDependencyPaths = generator.assetDependencyPaths;
sourceAssetDependencyPaths.AddRange(generator.assetDependencyPaths);

if (graph.messageManager.AnyError())
{
Expand Down