Skip to content
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

Jump to bottom

[2021.2][URP][ShaderGraph] Enable automatic render queue control on SG-based material inspector #4610

Merged
merged 5 commits into from
Jun 10, 2021
Merged

[2021.2][URP][ShaderGraph] Enable automatic render queue control on SG-based material inspector #4610

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2970941
Let the actual shader GUI for the subtarget decide how to display adv…
jessebarker Jun 4, 2021
981bac0
Add a new queue control field for Shader Graph based materials
jessebarker Jun 4, 2021
67f9962
Use QueueControl enum values to manage the value setting/getting and GUI
jessebarker Jun 7, 2021
b70aeb7
Merge branch 'master' into sg-fix-1335795
jessebarker Jun 7, 2021
0ae6d0e
Merge branch 'master' into sg-fix-1335795
marctem Jun 10, 2021
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
Next Next commit
Let the actual shader GUI for the subtarget decide how to display adv… 
…anced options
  • Loading branch information
@jessebarker
jessebarker committed Jun 4, 2021
commit 29709415ecd334541d17ebec07dddfe4da395eb2
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 @@ -97,6 +97,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed an issue where SamplerState properties could not be renamed after creation [1336126]
- Fixed loading all materials from project when saving a ShaderGraph.
- Fixed a ShaderGraph issue where resize handles on blackboard and graph inspector were too small [1329247] (https://issuetracker.unity3d.com/issues/shadergraph-resize-bounds-for-blackboard-and-graph-inspector-are-too-small)
- Fixed a ShaderGraph issue where a material inspector could contain an extra set of render queue, GPU instancing, and double-sided GI controls.

## [11.0.0] - 2020-10-21

Expand Down
9 changes: 0 additions & 9 deletions com.unity.shadergraph/Editor/Drawing/MaterialEditor/ShaderGraphPropertyDrawers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,6 @@ public static void DrawShaderGraphGUI(MaterialEditor materialEditor, IEnumerable
{
DrawCategory(materialEditor, properties, mcd);
}

EditorGUILayout.Space();
EditorGUILayout.Space();
if (SupportedRenderingFeatures.active.editableMaterialRenderQueue)
{
materialEditor.RenderQueueField();
}
materialEditor.EnableInstancingField();
materialEditor.DoubleSidedGIField();
}

private static void DrawCategory(MaterialEditor materialEditor, IEnumerable<MaterialProperty> properties, MinimalCategoryData minimalCategoryData)
Expand Down