From b2b299259b92c9af666e9b2cbe2d2c1be7fd1496 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 28 Feb 2001 01:35:32 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/actor/Actor.py                | 11 ++---------
 panda/src/cull/cullTraverser.cxx         |  2 +-
 panda/src/cull/geomBinNormal.cxx         |  2 +-
 panda/src/doc/howto.control_render_order |  6 +++---
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
index 4c1939508b..67814c10e3 100644
--- a/direct/src/actor/Actor.py
+++ b/direct/src/actor/Actor.py
@@ -671,15 +671,8 @@ class Actor(PandaObject, NodePath):
             return
         
         if mode < 0:
-            # Draw as a decal.  In case people don't have an
-            # up-to-date Panda, we'll fall back on
-            # DirectRenderTransition.
-            
-            try:
-                dt = DecalTransition()
-            except:
-                dt = DirectRenderTransition()
-
+            # Draw as a decal.
+            dt = DecalTransition()
         else:
             dt = DirectRenderTransition()
 
diff --git a/panda/src/cull/cullTraverser.cxx b/panda/src/cull/cullTraverser.cxx
index 52eb8f6ba9..c6e831ac25 100644
--- a/panda/src/cull/cullTraverser.cxx
+++ b/panda/src/cull/cullTraverser.cxx
@@ -252,7 +252,7 @@ setup_initial_bins() {
   GeomBinNormal *default_bin = new GeomBinNormal("default");
   GeomBinFixed *background = new GeomBinFixed("background");
   GeomBinFixed *fixed = new GeomBinFixed("fixed");
-  background->set_sort(20);
+  background->set_sort(10);
   fixed->set_sort(40);
 
   default_bin->set_traverser(this);
diff --git a/panda/src/cull/geomBinNormal.cxx b/panda/src/cull/geomBinNormal.cxx
index a510ca09a5..7759480196 100644
--- a/panda/src/cull/geomBinNormal.cxx
+++ b/panda/src/cull/geomBinNormal.cxx
@@ -24,7 +24,7 @@ GeomBinNormal(const string &name) :
 {
   GeomBinUnsorted *opaque = new GeomBinUnsorted("opaque");
   GeomBinBackToFront *transparent = new GeomBinBackToFront("transparent");
-  opaque->set_sort(10);
+  opaque->set_sort(20);
   transparent->set_sort(30);
 
   add_sub_bin(opaque);
diff --git a/panda/src/doc/howto.control_render_order b/panda/src/doc/howto.control_render_order
index d4c085efb7..a929cb31f1 100644
--- a/panda/src/doc/howto.control_render_order
+++ b/panda/src/doc/howto.control_render_order
@@ -101,8 +101,8 @@ GeomBinFixed.
 The order of all the predefined bins (and their predefined sort
 orders) is as follows:
 
-  10 - 'default'    : GeomBinNormal (opaque sub-bin)
-  20 - 'background' : GeomBinFixed
+  10 - 'background' : GeomBinFixed
+  20 - 'default'    : GeomBinNormal (opaque sub-bin)
   30 - 'default'    : GeomBinNormal (transparent sub-bin)
   40 - 'fixed'      : GeomBinFixed
 
@@ -124,7 +124,7 @@ create an bin called 'shadow' to render shadows in no particular
 order, but before any other transparent objects are rendered, you may
 add the line:
 
-  cull-bin shadow 15 unsorted
+  cull-bin shadow 25 unsorted
 
 The valid bin types are normal, unsorted, state-sorted, fixed, or
 back-to-front.