mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 09:52:27 -04:00
fix crash
This commit is contained in:
parent
165118829a
commit
f8d1a5e008
@ -542,20 +542,18 @@ match_egg_nodes(EggCharacterData *char_data, EggJointData *joint_data,
|
|||||||
|
|
||||||
// First, check to see if any of the names match any past-used
|
// First, check to see if any of the names match any past-used
|
||||||
// name.
|
// name.
|
||||||
|
|
||||||
EggNodeList more_egg_nodes;
|
EggNodeList more_egg_nodes;
|
||||||
|
|
||||||
for (ei = extra_egg_nodes.begin(); ei != extra_egg_nodes.end(); ++ei) {
|
for (ei = extra_egg_nodes.begin(); ei != extra_egg_nodes.end(); ++ei) {
|
||||||
EggNode *egg_node = (*ei);
|
EggNode *egg_node = (*ei);
|
||||||
bool matched = false;
|
bool matched = false;
|
||||||
for (di = extra_data.begin();
|
for (di = extra_data.begin(); di != extra_data.end(); ++di) {
|
||||||
di != extra_data.end() && !matched;
|
|
||||||
++di) {
|
|
||||||
EggJointData *data = (*di);
|
EggJointData *data = (*di);
|
||||||
if (data->matches_name(egg_node->get_name())) {
|
if (data->matches_name(egg_node->get_name())) {
|
||||||
matched = true;
|
|
||||||
found_egg_match(char_data, data, egg_node, egg_index, model_index);
|
found_egg_match(char_data, data, egg_node, egg_index, model_index);
|
||||||
extra_data.erase(di);
|
extra_data.erase(di);
|
||||||
|
matched = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user