From 6c36d79dd01bec3fd584de68599aa877cdeec3f4 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sun, 13 Jan 2002 20:30:57 +0000
Subject: [PATCH] call activate at render_frame(), not clear()

---
 panda/src/glgsg/glGraphicsStateGuardian.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/panda/src/glgsg/glGraphicsStateGuardian.cxx b/panda/src/glgsg/glGraphicsStateGuardian.cxx
index cda452d051..e716d25a58 100644
--- a/panda/src/glgsg/glGraphicsStateGuardian.cxx
+++ b/panda/src/glgsg/glGraphicsStateGuardian.cxx
@@ -344,7 +344,7 @@ reset() {
 void GLGraphicsStateGuardian::
 clear(const RenderBuffer &buffer) {
   PStatTimer timer(_win->_clear_pcollector);
-  activate();
+  //  activate();
 
   nassertv(buffer._gsg == this);
   int buffer_type = buffer._buffer_type;
@@ -467,6 +467,7 @@ render_frame() {
     << " --------------------------------------------" << endl;
 #endif
 
+  activate();
   _win->begin_frame();
   report_errors();
   _decal_level = 0;
@@ -606,7 +607,7 @@ render_subgraph(RenderTraverser *traverser,
                 const AllTransitionsWrapper &net_trans) {
   // Calling activate() frequently seems to be intolerably expensive
   // on some platforms.  We'll limit ourselves for now to calling it
-  // only during the clear().
+  // only in render_frame().
 
   //  activate();