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

multitexture materials #96

Merged
merged 15 commits into from
Sep 13, 2021
Merged

multitexture materials #96

merged 15 commits into from
Sep 13, 2021

Conversation

SArpnt
Copy link
Contributor

@SArpnt SArpnt commented Sep 1, 2021 •
edited
Loading

has merge conflicts because of docs and new commits

@SArpnt SArpnt requested a review from tumble1999 September 1, 2021 15:46
@SArpnt SArpnt added the feature New feature or request label Sep 1, 2021
tumble1999
tumble1999 approved these changes Sep 13, 2021
View reviewed changes
Copy link
Member

@tumble1999 tumble1999 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge Conflicts sorted

@tumble1999 tumble1999 assigned SArpnt and unassigned tumble1999 Sep 13, 2021
@SArpnt SArpnt merged commit 5ca80c7 into develop Sep 13, 2021
@SArpnt SArpnt deleted the feature/better-material branch September 16, 2021 01:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tumble1999 tumble1999 tumble1999 approved these changes

Assignees

@SArpnt SArpnt

Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SArpnt @tumble1999