Pārlūkot izejas kodu

fix typos in comments, fix show-transparency with M_dual

David Rose 19 gadi atpakaļ
vecāks
revīzija
2ed9484f06

+ 2 - 2
panda/src/pgraph/config_pgraph.cxx

@@ -222,14 +222,14 @@ ConfigVariableBool show_vertex_animation
 ("show-vertex-animation", false,
 ("show-vertex-animation", false,
  PRC_DESC("Set this true to flash any objects whose vertices are animated "
  PRC_DESC("Set this true to flash any objects whose vertices are animated "
           "by Panda on the CPU (flash red) or by hardware (flash blue).  "
           "by Panda on the CPU (flash red) or by hardware (flash blue).  "
-          "This only has effect when NDEBUG is defined."));
+          "This only has effect when NDEBUG is not defined."));
 
 
 ConfigVariableBool show_transparency
 ConfigVariableBool show_transparency
 ("show-transparency", false,
 ("show-transparency", false,
  PRC_DESC("Set this true to flash any objects that are rendered in "
  PRC_DESC("Set this true to flash any objects that are rendered in "
           "some transparency mode.  The color chosen is based on the  "
           "some transparency mode.  The color chosen is based on the  "
           "particular transparency mode in effect.  This only has effect "
           "particular transparency mode in effect.  This only has effect "
-          "when NDEBUG is defined."));
+          "when NDEBUG is not defined."));
 
 
 ConfigVariableBool m_dual
 ConfigVariableBool m_dual
 ("m-dual", true,
 ("m-dual", true,

+ 1 - 0
panda/src/pgraph/cullResult.cxx

@@ -139,6 +139,7 @@ add_object(CullableObject *object, const CullTraverser *traverser) {
     case TransparencyAttrib::M_dual:
     case TransparencyAttrib::M_dual:
 #ifndef NDEBUG
 #ifndef NDEBUG
       check_flash_transparency(object->_state, flash_dual_color);
       check_flash_transparency(object->_state, flash_dual_color);
+      state = object->_state;
 #endif
 #endif
       if (!m_dual) {
       if (!m_dual) {
         // If m_dual is configured off, it becomes M_alpha.
         // If m_dual is configured off, it becomes M_alpha.