TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix assertion failure with merge_bundles

Browse Source
This commit is contained in:
David Rose 2007-07-05 18:36:57 +00:00
parent 0742d177a4
commit 2ded3768ac
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/chan/partBundle.h
View File

@ -205,6 +205,7 @@ private:
static TypeHandle _type_handle; static TypeHandle _type_handle;
friend class PartBundleNode; friend class PartBundleNode;
friend class Character;
friend class MovingPartBase; friend class MovingPartBase;
friend class MovingPartMatrix; friend class MovingPartMatrix;
friend class MovingPartScalar; friend class MovingPartScalar;

2
panda/src/char/character.cxx
View File

@ -265,7 +265,9 @@ merge_bundles(PartBundle *old_bundle, PartBundle *new_bundle) {
// First, merge the bundles themselves. // First, merge the bundles themselves.
JointMap joint_map; JointMap joint_map;
r_merge_bundles(joint_map, old_bundle, new_bundle); r_merge_bundles(joint_map, old_bundle, new_bundle);
old_bundle->remove_node(this);
_bundles[index] = new_bundle; _bundles[index] = new_bundle;
new_bundle->add_node(this);
// Now convert the geometry to use the new bundle. // Now convert the geometry to use the new bundle.
GeomVertexMap gvmap; GeomVertexMap gvmap;