commit 09662068c38a2a30a92c1326d2e36f9b5fb2155a
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 25 20:18:47 2012 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 25 20:18:47 2012 +0000
tree 8c5c0639827ee317d28aef12d83e5e74ded8d114
parent e56513d2a9eebabf93d7824eebf9e64441c485ba

Disable assert blocking DEPS roll. This is a sanity-checking assert not
necessary to correct operation (yet). Will pursue a fix & reenable.

http://codereview.appspot.com/6330056/



git-svn-id: http://skia.googlecode.com/svn/trunk@4332 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 40921ea..a7d9b67 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1586,7 +1586,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrContext::setPaint(const GrPaint& paint) {
-    GrAssert(fDrawState->stagesDisabled());
+    // TODO: reenable this once we've cleaned up text state management
+    //GrAssert(fDrawState->stagesDisabled());
 
     for (int i = 0; i < GrPaint::kMaxTextures; ++i) {
         int s = i + GrPaint::kFirstTextureStage;