From fedbfe88815d25b11e68e0963162549a398d38c0 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 11 Aug 2015 11:00:04 -0700
Subject: [PATCH] fix jumbled merge

---
 libraries/gpu/src/gpu/State.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/gpu/src/gpu/State.h b/libraries/gpu/src/gpu/State.h
index 7ab723ac63..5500f20e06 100755
--- a/libraries/gpu/src/gpu/State.h
+++ b/libraries/gpu/src/gpu/State.h
@@ -125,7 +125,7 @@ public:
 
         bool isEnabled() const { return _enabled != 0; }
         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)); }
         DepthTest(int32 raw) { *(reinterpret_cast<int32*>(this)) = raw; }