blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Motion Path Calculations: Don't pass scene into motionpaths_calc_bake_targets() 

It's not needed, and actually precludes us from considering parallel
evaluation in future.
This commit is contained in:
Joshua Leung 2018-08-23 14:06:11 +12:00
parent 2f2ab13b5f
commit e01a9c5eee
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/anim.c
View File

@ -340,7 +340,7 @@ static void motionpaths_calc_update_scene(Main *bmain,
/* ........ */
/* perform baking for the targets on the current frame */
static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets)
static void motionpaths_calc_bake_targets(ListBase *targets, int cframe)
{
MPathTarget *mpt;
@ -352,12 +352,12 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets)
/* current frame must be within the range the cache works for
* - is inclusive of the first frame, but not the last otherwise we get buffer overruns
*/
if ((CFRA < mpath->start_frame) || (CFRA >= mpath->end_frame)) {
if ((cframe < mpath->start_frame) || (cframe >= mpath->end_frame)) {
continue;
}
/* get the relevant cache vert to write to */
mpv = mpath->points + (CFRA - mpath->start_frame);
mpv = mpath->points + (cframe - mpath->start_frame);
Object *ob_eval = mpt->ob_eval;
@ -386,7 +386,7 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets)
copy_v3_v3(mpv->co, ob_eval->obmat[3]);
}
float mframe = (float)(CFRA);
float mframe = (float)(cframe);
/* Tag if it's a keyframe */
if (BLI_dlrbTree_search_exact(&mpt->keys, compare_ak_cfraPtr, &mframe)) {
@ -471,7 +471,7 @@ static void motionpaths_calc_bake_targets(Scene *scene, ListBase *targets)
motionpaths_calc_update_scene(bmain, depsgraph);
/* perform baking for targets */
motionpaths_calc_bake_targets(scene, targets);
motionpaths_calc_bake_targets(targets, CFRA);
}
/* reset original environment */