clang reports: unclear || + && and &+| mixes. #1800

Merged
merged 2 commits into from Jan 7, 2017

Conversation

Projects
None yet
2 participants
@Azaezel
Contributor

Azaezel commented Oct 14, 2016

No description provided.

@Azaezel

This comment has been minimized.

Show comment
Hide comment
@Azaezel

Azaezel Oct 14, 2016

Contributor

I'll urge folks to take extra care validating this one in particular. While this run largely preserved present functionality, it did correct a couple very subtle bugs. Any oversights on my part are likely to be just as subtle.

Contributor

Azaezel commented Oct 14, 2016

I'll urge folks to take extra care validating this one in particular. While this run largely preserved present functionality, it did correct a couple very subtle bugs. Any oversights on my part are likely to be just as subtle.

Merge branch 'development' of https://github.com/GarageGames/Torque3D
…into andOrMaybe

Conflicts:
	Engine/source/T3D/staticShape.cpp

@Lopuska Lopuska merged commit 55b7a84 into GarageGames:development Jan 7, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment