mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-19 13:15:00 -04:00
resolve compilation error (ambiguity between different 'entries' variables)
This commit is contained in:
parent
5c327bdeff
commit
43eecb979f
@ -113,7 +113,7 @@ handle_entries() {
|
|||||||
FromEntries::iterator fei;
|
FromEntries::iterator fei;
|
||||||
for (fei = _from_entries.begin(); fei != _from_entries.end(); ++fei) {
|
for (fei = _from_entries.begin(); fei != _from_entries.end(); ++fei) {
|
||||||
NodePath from_node_path = fei->first;
|
NodePath from_node_path = fei->first;
|
||||||
Entries *entries = &fei->second;
|
Entries *entries_ptr = &fei->second;
|
||||||
|
|
||||||
Colliders::iterator ci;
|
Colliders::iterator ci;
|
||||||
ci = _colliders.find(from_node_path);
|
ci = _colliders.find(from_node_path);
|
||||||
@ -129,7 +129,7 @@ handle_entries() {
|
|||||||
ColliderDef &def = (*ci).second;
|
ColliderDef &def = (*ci).second;
|
||||||
|
|
||||||
// extract the collision entries into a vector that we can safely modify
|
// extract the collision entries into a vector that we can safely modify
|
||||||
Entries entries(*entries);
|
Entries entries(*entries_ptr);
|
||||||
|
|
||||||
// extract out the initial set of collision solids
|
// extract out the initial set of collision solids
|
||||||
CollisionSolids SCS;
|
CollisionSolids SCS;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user