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

chan: Lock PartBundle while binding animation

Browse Source 
This seems like the right thing to do that could prevent some potential race conditions; let me known if this is breaking anything.
This commit is contained in:
rdb 2021-11-28 16:21:59 +01:00
parent 480226a97a
commit c980643649
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/chan/partBundle.cxx
View File

@ -599,6 +599,10 @@ do_bind_anim(AnimControl *control, AnimBundle *anim,
return false; return false;
} }
// Grabbing the lock early prevents any other thread in stage 0 from also
// trying to modify the channel list at the same time.
CDLockedReader cdata(_cycler);
plist<int> holes; plist<int> holes;
int channel_index = 0; int channel_index = 0;
pick_channel_index(holes, channel_index); pick_channel_index(holes, channel_index);
@ -616,7 +620,6 @@ do_bind_anim(AnimControl *control, AnimBundle *anim,
subset.is_include_empty(), bound_joints, subset); subset.is_include_empty(), bound_joints, subset);
control->setup_anim(this, anim, channel_index, bound_joints); control->setup_anim(this, anim, channel_index, bound_joints);
CDReader cdata(_cycler);
determine_effective_channels(cdata); determine_effective_channels(cdata);
return true; return true;