kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix [#30097] Motion paths range not correct - Part B (Recalculating existing

Browse Source 
paths with new ranges)

If an object/bone already had a motion path, it was not possible to recalculate
it over a different frame range without firstly clearing these paths. This was
both a confusing and troublesome workflow, and has since been removed.
This commit is contained in:
Joshua Leung 2012-05-01 13:10:36 +00:00
parent cb99062ebc
commit 7a87b89a60
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,9 +144,11 @@ void animviz_free_motionpath(bMotionPath *mpath)
/* ------------------- */ /* ------------------- */
/* Setup motion paths for the given data /* Setup motion paths for the given data
* - scene: current scene (for frame ranges, etc.) * - Only used when explicitly calculating paths on bones which may/may not be consider already
* - ob: object to add paths for (must be provided) *
* - pchan: posechannel to add paths for (optional; if not provided, object-paths are assumed) * < scene: current scene (for frame ranges, etc.)
* < ob: object to add paths for (must be provided)
* < pchan: posechannel to add paths for (optional; if not provided, object-paths are assumed)
*/ */
bMotionPath *animviz_verify_motionpaths(ReportList *reports, Scene *scene, Object *ob, bPoseChannel *pchan) bMotionPath *animviz_verify_motionpaths(ReportList *reports, Scene *scene, Object *ob, bPoseChannel *pchan)
{ {
@ -180,15 +182,28 @@ bMotionPath *animviz_verify_motionpaths(ReportList *reports, Scene *scene, Objec
} }
/* if there is already a motionpath, just return that, /* if there is already a motionpath, just return that,
* but provided it's settings are ok * provided it's settings are ok (saves extra free+alloc)
*/ */
if (*dst != NULL) { if (*dst != NULL) {
int expected_length = avs->path_ef - avs->path_sf;
mpath= *dst; mpath= *dst;
/* if range is not invalid, and/or length is set ok, just return */ /* path is "valid" if length is valid, but must also be of the same length as is being requested */
if ((mpath->start_frame != mpath->end_frame) && (mpath->length > 0)) if ((mpath->start_frame != mpath->end_frame) && (mpath->length > 0)) {
/* outer check ensures that we have some curve data for this path */
if (mpath->length == expected_length) {
/* return/use this as it is already valid length */
return mpath; return mpath;
} }
else {
/* clear the existing path (as the range has changed), and reallocate below */
if (mpath->points)
MEM_freeN(mpath->points);
mpath->points = NULL;
}
}
}
else { else {
/* create a new motionpath, and assign it */ /* create a new motionpath, and assign it */
mpath= MEM_callocN(sizeof(bMotionPath), "bMotionPath"); mpath= MEM_callocN(sizeof(bMotionPath), "bMotionPath");