Skip to content

Commit

Permalink
Fix issue causing asset dependencies to be ignored (#438)
Browse files Browse the repository at this point in the history
* Fix issue causing asset dependencies to be ignored

* [skip ci] Bump importer version for Hybrid as well
  • Loading branch information
pbbastian authored Jun 9, 2020
1 parent 6a19727 commit ecf72b6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions com.unity.shadergraph/Editor/Importers/ShaderGraphImporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ namespace UnityEditor.ShaderGraph
// sure that all shader graphs get re-imported. Re-importing is required,
// because the shader graph codegen is different for V2.
// This ifdef can be removed once V2 is the only option.
[ScriptedImporter(101, Extension, 3)]
[ScriptedImporter(102, Extension, 3)]
#else
[ScriptedImporter(33, Extension, 3)]
[ScriptedImporter(34, Extension, 3)]
#endif

class ShaderGraphImporter : ScriptedImporter
Expand Down Expand Up @@ -180,7 +180,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

0 comments on commit ecf72b6

Please sign in to comment.