Skip to content

[Skip CI] make blackboard check if shader input is AbstractMaterialProperty and set hidden instead of generateproproperty if so #69

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

Closed
wants to merge 1 commit into from
Closed

[Skip CI] make blackboard check if shader input is AbstractMaterialProperty and set hidden instead of generateproproperty if so #69

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
21 changes: 18 additions & 3 deletions com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardFieldView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,27 @@ void BuildDefaultFields(ShaderInput input)
m_ExposedToogle.OnToggleChanged(evt =>
{
m_Graph.owner.RegisterCompleteObjectUndo("Change Exposed Toggle");
input.generatePropertyBlock = evt.newValue;
m_BlackboardField.icon = input.generatePropertyBlock ? BlackboardProvider.exposedIcon : null;
if (input is AbstractShaderProperty p)
{
p.hidden = !evt.newValue;
m_BlackboardField.icon = !p.hidden ? BlackboardProvider.exposedIcon : null;
}
else
{
input.generatePropertyBlock = evt.newValue;
m_BlackboardField.icon = input.generatePropertyBlock ? BlackboardProvider.exposedIcon : null;
}
Rebuild();
DirtyNodes(ModificationScope.Graph);
});
m_ExposedToogle.value = input.generatePropertyBlock && input.isExposable;
if(input is AbstractShaderProperty prop)
{
m_ExposedToogle.value = !prop.hidden && prop.isExposable;
}
else
{
m_ExposedToogle.value = input.generatePropertyBlock && input.isExposable;
}
AddRow("Exposed", m_ExposedToogle, input.isExposable);
}

Expand Down
2 changes: 1 addition & 1 deletion com.unity.shadergraph/Editor/Drawing/Blackboard/BlackboardProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ void AddInputRow(ShaderInput input, bool create = false, int index = -1)
{
case AbstractShaderProperty property:
{
var icon = (m_Graph.isSubGraph || (property.isExposable && property.generatePropertyBlock)) ? exposedIcon : null;
var icon = (m_Graph.isSubGraph || (property.isExposable && property.generatePropertyBlock && !property.hidden)) ? exposedIcon : null;
field = new BlackboardField(icon, property.displayName, property.propertyType.ToString()) { userData = property };
var propertyView = new BlackboardFieldPropertyView(field, m_Graph, property);
row = new BlackboardRow(field, propertyView) { userData = input };
Expand Down