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.

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

Material.fromType uniforms #1522

Merged
merged 5 commits into from
Feb 28, 2014
Merged

Material.fromType uniforms #1522

merged 5 commits into from
Feb 28, 2014

Conversation

bagnell
Copy link
Contributor

@bagnell bagnell commented Feb 28, 2014

Add second parameter to Material.fromType to override default uniforms. Fixes part 1 of #1185.

@pjcozzi
Copy link
Contributor

pjcozzi commented Feb 28, 2014

Looks good. Tests and Sandcastle are good.

pjcozzi added a commit that referenced this pull request Feb 28, 2014
@pjcozzi pjcozzi merged commit ded21c5 into master Feb 28, 2014
@pjcozzi pjcozzi deleted the materialUniforms branch February 28, 2014 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants