Browse Source

prevent uv scroll combining

Zachary Pavlov 16 years ago
parent
commit
c93ddf0346
2 changed files with 12 additions and 0 deletions
  1. 11 0
      panda/src/pgraph/uvScrollNode.cxx
  2. 1 0
      panda/src/pgraph/uvScrollNode.h

+ 11 - 0
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;
+}

+ 1 - 0
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: