search

Seneral / Node_Editor_Framework

A flexible and modular Node Editor Framework for creating node based displays and editors in Unity
https://nodeeditor.seneral.dev
MIT License
2.01k stars 414 forks source link

Master #95

Closed Keerpich closed 8 years ago

Keerpich commented 8 years ago
  1. I added the possibility to return null from the Node.Create function in order to support things like: the user wants an unique node and checks that on create so if there is a similar node already in existance the function will return null
  2. I added a simple IntField
Seneral commented 8 years ago

There's already an IntField in RTEditorGUI, isn't it? I think it's just a wrapper for FloatField, casting to int, but it works... Allowing unique nodes is nice though, thank you! Also, I changed the target branch to develop to keep it tidy;)

Keerpich commented 8 years ago

Just thought it will be nice to have it there explicitly :smile:

Keerpich commented 8 years ago

Also, I got another commit to fix the case when the Create function returns null since that will mess up the node type registration in NodeTypes.cs . After this is merged I will create a pull request for that one too, ok?

Seneral commented 8 years ago

Better to add that commit to this pull request so it is together;) I think you just need to push your fix to your master branch and it will automatically appear here.

Keerpich commented 8 years ago

Note: the 3rd commit was messed up

Seneral commented 8 years ago

Can you remove both commit 3&4? I've previously committed a fix that removes the modified line in NodeTypes.cs that calls node.Create because it was not needed. Seems this is causing the merge conflicts;) Also, two is redundant, as said previously... So the fix you mentioned would also be not needed, I did not immediately realized this but as I said above the line we're talking about has been removed;)

Seneral commented 8 years ago

Or rather, can you create a new pull request with only your first commit in it? Maybe pull the develop branch in your develop to get it updated and then apply your first commit and it if works, create a new PR? Hope you can follow me why this would be cleaner;)