From 4854ec070ccdb8cfeb2dd23164a786a038524af3 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 23 May 2007 16:11:50 +0000
Subject: [PATCH] remove 'deprecated' comments

---
 panda/src/pgraph/textureAttrib.I   |  8 +++++---
 panda/src/pgraph/textureAttrib.cxx | 11 ++---------
 panda/src/pgraph/textureAttrib.h   |  5 ++---
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/panda/src/pgraph/textureAttrib.I b/panda/src/pgraph/textureAttrib.I
index 0ecbb7f5fe..f3dc2e9847 100644
--- a/panda/src/pgraph/textureAttrib.I
+++ b/panda/src/pgraph/textureAttrib.I
@@ -53,9 +53,11 @@ TextureAttrib(const TextureAttrib &copy) :
 //               TextureAttrib, indicating that it should disable
 //               texturing.
 //
-//               This method is deprecated, and is provided for
-//               backward compatibility; you should use the
-//               multitexture form of this instead.
+//               If multitexture is in effect, a TextureAttrib may not
+//               be strictly "on" or "off"; therefore, to get a more
+//               precise answer to this question, you should consider
+//               using has_all_off() or get_num_off_stages() or
+//               has_off_stage() instead.
 ////////////////////////////////////////////////////////////////////
 INLINE bool TextureAttrib::
 is_off() const {
diff --git a/panda/src/pgraph/textureAttrib.cxx b/panda/src/pgraph/textureAttrib.cxx
index 023998d944..b26821425a 100644
--- a/panda/src/pgraph/textureAttrib.cxx
+++ b/panda/src/pgraph/textureAttrib.cxx
@@ -48,11 +48,8 @@ public:
 //     Function: TextureAttrib::make
 //       Access: Published, Static
 //  Description: Constructs a new TextureAttrib object suitable for
-//               rendering the indicated texture onto geometry.
-//
-//               This method is deprecated, and is provided for
-//               backward compatibility; you should use the
-//               multitexture form of this instead.
+//               rendering the indicated texture onto geometry, using
+//               the default TextureStage.
 ////////////////////////////////////////////////////////////////////
 CPT(RenderAttrib) TextureAttrib::
 make(Texture *texture) {
@@ -64,10 +61,6 @@ make(Texture *texture) {
 //       Access: Published, Static
 //  Description: Constructs a new TextureAttrib object suitable for
 //               rendering untextured geometry.
-//
-//               This method is deprecated, and is provided for
-//               backward compatibility; you should use the
-//               multitexture form of this instead.
 ////////////////////////////////////////////////////////////////////
 CPT(RenderAttrib) TextureAttrib::
 make_off() {
diff --git a/panda/src/pgraph/textureAttrib.h b/panda/src/pgraph/textureAttrib.h
index 5cb37613fe..b5a8c6c346 100644
--- a/panda/src/pgraph/textureAttrib.h
+++ b/panda/src/pgraph/textureAttrib.h
@@ -41,9 +41,8 @@ protected:
   INLINE TextureAttrib(const TextureAttrib &copy);
 
 PUBLISHED:
-  // These methods are deprecated, but they remain for now, for
-  // backward compatibility.  They treat the TextureAttrib as a
-  // single-texture application.
+  // These methods are used to create a simple, single-textured layer.
+  // For multitexture, use the multitexture interfaces, further below.
   static CPT(RenderAttrib) make(Texture *tex);
   static CPT(RenderAttrib) make_off();