archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Wednesday merger of Orange branch and bf-blender

Browse Source
This commit is contained in:
Ton Roosendaal
2005-12-14 14:24:23 +00:00
parent 9983c5f172 564ca3cede
commit 2fd72143f6
3 changed files with 216 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/action.c
View File

@@ -910,8 +910,10 @@ static void do_nla(Object *ob, int blocktype)
else{
if (strip->flag & ACTSTRIP_HOLDLASTFRAME){
/* we want the strip to hold on the exact fraction of the repeat value */
frametime = actlength * (strip->repeat-(int)strip->repeat);
frametime= bsystem_time(ob, 0, frametime, 0.0);
if(frametime<=0.000001f) frametime= actlength; /* rounding errors... */
frametime= bsystem_time(ob, 0, frametime+strip->actstart, 0.0);
if(blocktype==ID_AR)
extract_pose_from_action (tpose, strip->act, frametime);