Browse Source

fix pupils

David Rose 21 years ago
parent
commit
1707b5a38d
1 changed files with 2 additions and 2 deletions
  1. 2 2
      panda/src/pgraph/textureAttrib.cxx

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

@@ -535,7 +535,7 @@ compose_impl(const RenderAttrib *other) const {
 
 
     } else {  // (*bi).first == (*ai).first
     } else {  // (*bi).first == (*ai).first
       // Here is a stage we have in both.
       // Here is a stage we have in both.
-      *result = *ai;
+      *result = *bi;
       new_attrib->_on_stages.push_back((*ai).first);
       new_attrib->_on_stages.push_back((*ai).first);
       ++ai;
       ++ai;
       ++bi;
       ++bi;
@@ -562,7 +562,7 @@ compose_impl(const RenderAttrib *other) const {
 
 
     } else {
     } else {
       // Here is a stage we have in both.
       // Here is a stage we have in both.
-      *result = *ai;
+      *result = *bi;
       new_attrib->_on_stages.push_back((*ai).first);
       new_attrib->_on_stages.push_back((*ai).first);
       ++ai;
       ++ai;
       ++bi;
       ++bi;