From c93ddf034616fc7bb11001f87d90ca4eafd38a79 Mon Sep 17 00:00:00 2001
From: Zachary Pavlov <zachary.pavlov@gmail.com>
Date: Thu, 23 Jul 2009 21:04:27 +0000
Subject: [PATCH] prevent uv scroll combining

---
 panda/src/pgraph/uvScrollNode.cxx | 11 +++++++++++
 panda/src/pgraph/uvScrollNode.h   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/panda/src/pgraph/uvScrollNode.cxx b/panda/src/pgraph/uvScrollNode.cxx
index f480bb094e..c1a75e636b 100755
--- a/panda/src/pgraph/uvScrollNode.cxx
+++ b/panda/src/pgraph/uvScrollNode.cxx
@@ -148,3 +148,14 @@ bool UvScrollNode::
 safe_to_flatten() const {
   return false;
 }
+
+////////////////////////////////////////////////////////////////////
+//     Function: UvScrollNode::safe_to_combine
+//       Access: Public, Virtual
+//  Description: Returns true if it is generally safe to combine this
+//               with other nodes, which it isn't, so don't. Ever.
+////////////////////////////////////////////////////////////////////
+bool UvScrollNode::
+safe_to_combine() const {
+  return false;
+}
diff --git a/panda/src/pgraph/uvScrollNode.h b/panda/src/pgraph/uvScrollNode.h
index 7788ada5d4..b91ee54a9e 100755
--- a/panda/src/pgraph/uvScrollNode.h
+++ b/panda/src/pgraph/uvScrollNode.h
@@ -36,6 +36,7 @@ protected:
 public:
   virtual PandaNode *make_copy() const;
   virtual bool safe_to_flatten() const;
+  virtual bool safe_to_combine() const;
   virtual bool cull_callback(CullTraverser *trav, CullTraverserData &data);
 
 PUBLISHED: