浏览代码

fix pupils

David Rose 21 年之前
父节点
当前提交
1707b5a38d
共有 1 个文件被更改,包括 2 次插入2 次删除
  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
       // Here is a stage we have in both.
-      *result = *ai;
+      *result = *bi;
       new_attrib->_on_stages.push_back((*ai).first);
       ++ai;
       ++bi;
@@ -562,7 +562,7 @@ compose_impl(const RenderAttrib *other) const {
 
     } else {
       // Here is a stage we have in both.
-      *result = *ai;
+      *result = *bi;
       new_attrib->_on_stages.push_back((*ai).first);
       ++ai;
       ++bi;