Skip to content

New functionality that supports compile time branching based on user created dropdowns. #4137

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
marctem merged 32 commits into from
Apr 29, 2021
Merged

New functionality that supports compile time branching based on user created dropdowns. #4137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
def15db
Compile time dropdown blackboard properties + DropDownNode.
russoh Apr 7, 2021
14501ff
Cleanup comments.
russoh Apr 7, 2021
2d743a5
Fix default dimension for vector type (4->1).
russoh Apr 12, 2021
324ea48
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 13, 2021
b5d938b
Bump version numbers.
russoh Apr 13, 2021
f374990
Various fixes needed post merge of master.
russoh Apr 14, 2021
154910d
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 14, 2021
0b8a479
Formatting.
russoh Apr 14, 2021
10ae436
Output shader code formatting.
russoh Apr 14, 2021
b97bc19
Formatting.
russoh Apr 14, 2021
6fc6d36
Check name clash.
russoh Apr 14, 2021
2fbe4f0
Tests.
russoh Apr 14, 2021
c7cd814
Add material.
russoh Apr 14, 2021
0509651
Fixes.
russoh Apr 15, 2021
de6b489
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 21, 2021
e19b4ff
Incorporate bug fix for adding dropdowns based on recent PR fix for k…
russoh Apr 21, 2021
ecc004b
Fix for refreshing blackboard when pasting properties.
russoh Apr 22, 2021
7dddb29
Fix erroneous copy command.
russoh Apr 22, 2021
c976636
Clamp value on set and get to avoid any possibility of using data out…
russoh Apr 22, 2021
e739fba
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 22, 2021
8eb9e9a
Update test images to latest.
russoh Apr 23, 2021
73d8fe7
Update iPhone image.
russoh Apr 23, 2021
f6b9fea
Updated OSX image.
russoh Apr 23, 2021
e62270b
Prevent dragging dropdowns into parent graph.
russoh Apr 23, 2021
3bb9117
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 26, 2021
c1383b5
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 27, 2021
28294c6
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 28, 2021
573f987
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 28, 2021
213eae9
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 28, 2021
4b27597
Remove redundant serialization code.
russoh Apr 28, 2021
3bd61e9
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 29, 2021
26785b4
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
russoh Apr 29, 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
909 changes: 909 additions & 0 deletions TestProjects/ShaderGraph/Assets/CommonAssets/Graphs/DropdownSubgraph.shadersubgraph
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions TestProjects/ShaderGraph/Assets/CommonAssets/Graphs/DropdownSubgraph.shadersubgraph.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading