mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 02:15:43 -04:00
fix pupils
This commit is contained in:
parent
13fba5c442
commit
1707b5a38d
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user