Multiple Oceans: Connect underwater to ocean instance#829
Merged
magenta404 merged 3 commits intofeature/multiple-oceansfrom May 14, 2021
Merged
Multiple Oceans: Connect underwater to ocean instance#829magenta404 merged 3 commits intofeature/multiple-oceansfrom
magenta404 merged 3 commits intofeature/multiple-oceansfrom
Conversation
huwb
approved these changes
May 13, 2021
Contributor
huwb
left a comment
There was a problem hiding this comment.
Approving this, even though my comments suggest change. Given this is going into a dev branch and will probably be reviewed again i dont mind too much.
Oh and is main.unity changes intentional? I'm fine with them if they are.
Validation already enforces a camera as a parent.
5828a39 to
eca9f89
Compare
Collaborator
Author
|
Thanks.
They were as it sets up two cameras for testing. But a have dropped that commit as I have instead duplicated the scene to an git ignored folder for testing instead. This should make merging master into your branch easier. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is to be merged into #650.
I had this in my stash. I tested with two ocean instances and two cameras. Appears to work. I have added test data with two camera setup.