diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 21:22:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 21:22:04 +0400 |
| commit | a73c3fe5c992777718431d5e5bb5f8a2c3b7a1bc (patch) | |
| tree | 51ca1d7a06715f0dde24196157c915b12da334c0 /source/blender/blenkernel/intern/anim_sys.c | |
| parent | 9c8f1e2ef487483bc374feaed9ff709e07638623 (diff) | |
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index b4adaa0ab07..6e933ddd386 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1905,7 +1905,7 @@ static void animsys_evaluate_nla (PointerRNA *ptr, AnimData *adt, float ctime) /* action range is calculated taking F-Modifiers into account (which making new strips doesn't do due to the troublesome nature of that) */ calc_action_range(dummy_strip.act, &dummy_strip.actstart, &dummy_strip.actend, 1); dummy_strip.start = dummy_strip.actstart; - dummy_strip.end = (IS_EQ(dummy_strip.actstart, dummy_strip.actend)) ? (dummy_strip.actstart + 1.0f): (dummy_strip.actend); + dummy_strip.end = (IS_EQF(dummy_strip.actstart, dummy_strip.actend)) ? (dummy_strip.actstart + 1.0f): (dummy_strip.actend); dummy_strip.blendmode= adt->act_blendmode; dummy_strip.extendmode= adt->act_extendmode; @@ -2072,7 +2072,7 @@ void BKE_animsys_evaluate_animdata (ID *id, AnimData *adt, float ctime, short re void BKE_animsys_evaluate_all_animation (Main *main, float ctime) { ID *id; - + if (G.f & G_DEBUG) printf("Evaluate all animation - %f \n", ctime); |