Skip to content

Commit cd6fbd9

Browse files
committed
fixed scripted importer issue
1 parent 785bcac commit cd6fbd9

File tree

5 files changed

+23
-9
lines changed

5 files changed

+23
-9
lines changed

Packages/sh.orels.shaders.generator/Editor/GeneratorProjectSettings.cs

+14
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,20 @@ public static GeneratorProjectSettings GetOrCreateSettings()
4646
return settings;
4747
}
4848

49+
/// <summary>
50+
/// This version of Get Settings does not create a physical asset if none exists.
51+
/// This is needed for scripted importers, as creating an asset during import will cause a unity error
52+
/// </summary>
53+
/// <returns></returns>
54+
public static GeneratorProjectSettings GetSettings()
55+
{
56+
var settings = AssetDatabase.LoadAssetAtPath<GeneratorProjectSettings>(SETTINGS_PATH);
57+
if (settings != null) return settings;
58+
59+
settings = ScriptableObject.CreateInstance<GeneratorProjectSettings>();
60+
return settings;
61+
}
62+
4963
public static SerializedObject GetSerializedSettings()
5064
{
5165
return new SerializedObject(GetOrCreateSettings());

Packages/sh.orels.shaders.generator/Editor/ShaderDefinitionImporter.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class ShaderDefinitionImporter : ScriptedImporter
2727
#region Serialized Fields
2828

2929
public bool debugBuild;
30-
private bool DebugBuild => debugBuild || GeneratorProjectSettings.GetOrCreateSettings().forceDebugBuilds;
30+
private bool DebugBuild => debugBuild || GeneratorProjectSettings.GetSettings().forceDebugBuilds;
3131
// Cached version of the debug flag to avoid constant asset pinging
3232
private bool _isDebugBuild;
3333

@@ -80,12 +80,12 @@ public ShaderError(ShaderBlock block, int line, string file, string message, str
8080

8181
private List<ShaderBlock> _builtInBlocks;
8282

83-
private List<ModuleRemap> UserModuleRemaps => GeneratorProjectSettings.GetOrCreateSettings().userModuleRemaps;
83+
private List<ModuleRemap> UserModuleRemaps => GeneratorProjectSettings.GetSettings().userModuleRemaps;
8484
// Cached version of the user module remaps to avoid constant asset pinging
8585
private List<ModuleRemap> _userModuleRemaps;
8686

8787
// Some blocks need to be included in all shaders
88-
private List<string> AlwaysIncludedBlockSources => GeneratorProjectSettings.GetOrCreateSettings().alwaysIncludedBlocks;
88+
private List<string> AlwaysIncludedBlockSources => GeneratorProjectSettings.GetSettings().alwaysIncludedBlocks;
8989

9090
private List<ShaderBlock> AlwaysIncludedBlocks
9191
{
@@ -113,7 +113,7 @@ private List<ShaderBlock> AlwaysIncludedBlocks
113113
}
114114
}
115115

116-
private string DefaultLightingModel => GeneratorProjectSettings.GetOrCreateSettings().defaultLightingModel;
116+
private string DefaultLightingModel => GeneratorProjectSettings.GetSettings().defaultLightingModel;
117117

118118
#endregion
119119

Packages/sh.orels.shaders.generator/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "sh.orels.shaders.generator",
33
"displayName": "ORL Shader Generator",
44
"description": "A template-based shader generator utilizing scripted importers",
5-
"version": "7.0.0-dev.4",
5+
"version": "7.0.0-dev.5",
66
"unity": "2019.4",
77
"author": {
88
"name": "orels1",

Packages/sh.orels.shaders.inspector/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "sh.orels.shaders.inspector",
33
"displayName": "ORL Shader Inspector",
44
"description": "A simple property-based shader inspector with extension support",
5-
"version": "7.0.0-dev.4",
5+
"version": "7.0.0-dev.5",
66
"unity": "2019.4",
77
"author": {
88
"name": "orels1",

Packages/sh.orels.shaders/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "sh.orels.shaders",
33
"displayName": "ORL Shaders",
44
"description": "PBR Unity shaders for the Built-In pipeline built with ORL Shader Generator",
5-
"version": "7.0.0-dev.4",
5+
"version": "7.0.0-dev.5",
66
"unity": "2019.4",
77
"author": {
88
"name": "orels1",
@@ -18,7 +18,7 @@
1818
"license": "MIT",
1919
"type": "assets",
2020
"vpmDependencies": {
21-
"sh.orels.shaders.generator": "^7.0.0-dev.4",
22-
"sh.orels.shaders.inspector": "^7.0.0-dev.4"
21+
"sh.orels.shaders.generator": "^7.0.0-dev.5",
22+
"sh.orels.shaders.inspector": "^7.0.0-dev.5"
2323
}
2424
}

0 commit comments

Comments
 (0)