TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make instance count override properly

Browse Source
This commit is contained in:
tobspr 2015-08-15 21:07:06 +02:00 committed by rdb
parent cb41ff2791
commit 0ec8f1d758
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/pgraph/shaderAttrib.cxx
View File

@ -696,8 +696,18 @@ compose_impl(const RenderAttrib *other) const {
}
}
}
// Just copy the instance count.
attr->_instance_count = over->_instance_count;
// In case no instance count is set, just copy it.
if (attr->_instance_count == 0) {
attr->_instance_count = over->_instance_count;
} else {
// If an instance count is set, check if the other attrib has an instance count set,
// if so, override it, otherwise just keep the current instance count
if (over->_instance_count > 0) {
attr->_instance_count = over->_instance_count;
}
}
// Update the flags.
attr->_flags &= ~(over->_has_flags);
attr->_flags |= over->_flags;