diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-08-05 13:21:29 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-08-05 13:21:29 +0400 |
| commit | c4114780d43f2cc973eaad193c61127e9ee54b28 (patch) | |
| tree | dbc551eee68dde0e0104deef4d028979dc1efca6 /source/blender/blenkernel/intern/key.c | |
| parent | 7dfbe481e26f1b067315ee067f772a9195faf7f2 (diff) | |
Little code cleanup.
bsystem_time was being called with an extra variable, which was useless. Most of the places that called it, were passing NULL for that variable anyway.
I've also cleaned up that function a bit, but the underlying problems with that part of the code still exist (EVIL GLOBALS that are exported for frame_to_float), for mblur and fields rendering features. That remains for another time.
Diffstat (limited to 'source/blender/blenkernel/intern/key.c')
| -rw-r--r-- | source/blender/blenkernel/intern/key.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 345bc522449..0b5650ece44 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1025,7 +1025,7 @@ static int do_mesh_key(Object *ob, Mesh *me) for(a=0; a<me->totvert; a+=step, cfra+= delta) { - ctime= bsystem_time(0, 0, cfra, 0.0); + ctime= bsystem_time(0, cfra, 0.0); if(calc_ipo_spec(me->key->ipo, KEY_SPEED, &ctime)==0) { ctime /= 100.0; CLAMP(ctime, 0.0, 1.0); @@ -1060,7 +1060,7 @@ static int do_mesh_key(Object *ob, Mesh *me) } } else { - ctime= bsystem_time(ob, 0, G.scene->r.cfra, 0.0); + ctime= bsystem_time(ob, G.scene->r.cfra, 0.0); if(calc_ipo_spec(me->key->ipo, KEY_SPEED, &ctime)==0) { ctime /= 100.0; @@ -1180,7 +1180,7 @@ static int do_curve_key(Curve *cu) for(a=0; a<tot; a+=step, cfra+= delta) { - ctime= bsystem_time(0, 0, cfra, 0.0); + ctime= bsystem_time(0, cfra, 0.0); if(calc_ipo_spec(cu->key->ipo, KEY_SPEED, &ctime)==0) { ctime /= 100.0; CLAMP(ctime, 0.0, 1.0); @@ -1202,7 +1202,7 @@ static int do_curve_key(Curve *cu) } else { - ctime= bsystem_time(NULL, 0, (float)G.scene->r.cfra, 0.0); + ctime= bsystem_time(NULL, (float)G.scene->r.cfra, 0.0); if(cu->key->type==KEY_RELATIVE) { do_rel_cu_key(cu, ctime); @@ -1244,7 +1244,7 @@ static int do_latt_key(Object *ob, Lattice *lt) for(a=0; a<tot; a++, cfra+= delta) { - ctime= bsystem_time(0, 0, cfra, 0.0); + ctime= bsystem_time(0, cfra, 0.0); if(calc_ipo_spec(lt->key->ipo, KEY_SPEED, &ctime)==0) { ctime /= 100.0; CLAMP(ctime, 0.0, 1.0); @@ -1261,7 +1261,7 @@ static int do_latt_key(Object *ob, Lattice *lt) } } else { - ctime= bsystem_time(NULL, 0, (float)G.scene->r.cfra, 0.0); + ctime= bsystem_time(NULL, (float)G.scene->r.cfra, 0.0); if(lt->key->type==KEY_RELATIVE) { KeyBlock *kb; @@ -1342,7 +1342,7 @@ int do_ob_key(Object *ob) if(ob->ipoflag & OB_ACTION_KEY) do_all_object_actions(ob); else { - calc_ipo(key->ipo, bsystem_time(ob, 0, G.scene->r.cfra, 0.0)); + calc_ipo(key->ipo, bsystem_time(ob, G.scene->r.cfra, 0.0)); execute_ipo((ID *)key, key->ipo); } |