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

tr_shader: do not enable deluxe map on material without normal map #195

Merged
merged 2 commits into from Mar 31, 2019

Conversation

Projects
None yet
2 participants
@illwieckz
Copy link
Member

illwieckz commented Mar 31, 2019

fix a regression introduced in 3d53075

before regression:
deluxe without normal

after regression:
deluxe without normal

after fix:
deluxe without normal

@illwieckz illwieckz force-pushed the illwieckz:fixdeluxe branch from 902c8e7 to 019f56e Mar 31, 2019

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Mar 31, 2019

@slipher, may be a dumb question, but I guess I can replace this:

normalMapping = normalMapping && deluxeMapping;

by this:

normalMapping &= deluxeMapping;

right?

(I only did this with bit fields before, not boolean, but I see no reason why it wouldn't work)

@slipher

This comment has been minimized.

Copy link
Contributor

slipher commented Mar 31, 2019

You can. It doesn't actually look nicer though.

@illwieckz illwieckz force-pushed the illwieckz:fixdeluxe branch from 019f56e to 8efc535 Mar 31, 2019

@illwieckz illwieckz merged commit 8efc535 into DaemonEngine:master Mar 31, 2019

0 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.