Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 19:56:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix jumbled merge

Browse source
This commit is contained in:
Seth Alves 2015-08-11 11:00:04 -07:00
parent 804c1ecf8e
commit fedbfe8881
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/State.h
View file

@ -125,7 +125,7 @@ public:
bool isEnabled() const { return _enabled != 0; } bool isEnabled() const { return _enabled != 0; }
ComparisonFunction getFunction() const { return ComparisonFunction(_function); } ComparisonFunction getFunction() const { return ComparisonFunction(_function); }
uint8 getWriteMask() const { return _writeMask != 0; } uint8 getWriteMask() const { return _writeMask; }
int32 getRaw() const { return *(reinterpret_cast<const int32*>(this)); } int32 getRaw() const { return *(reinterpret_cast<const int32*>(this)); }
DepthTest(int32 raw) { *(reinterpret_cast<int32*>(this)) = raw; } DepthTest(int32 raw) { *(reinterpret_cast<int32*>(this)) = raw; }