Commit: cc28e02a85d137d923045b29e584e9264da74c0d
Author: Campbell Barton
Date: Mon Aug 4 10:22:45 2014 +1000
Branches: master
https://developer.blender.org/rBcc28e02a85d137d923045b29e584e9264da74c0d
Cleanup: replace int cast with floorf when comparing time
===================================================================
M source/blender/blenkernel/intern/nla.c
M source/blender/editors/armature/pose_lib.c
===================================================================
diff --git a/source/blender/blenkernel/intern/nla.c
b/source/blender/blenkernel/intern/nla.c
index 9790394..19e4514 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -430,7 +430,7 @@ static float nlastrip_get_frame_actionclip(NlaStrip *strip,
float cframe, short
return (strip->end + (strip->actstart * scale -
cframe)) / scale;
}
else { /* if (mode == NLATIME_CONVERT_EVAL) */
- if (IS_EQF(cframe, strip->end) && IS_EQF(strip->repeat,
((int)strip->repeat))) {
+ if (IS_EQF((float)cframe, strip->end) &&
IS_EQF(strip->repeat, floorf(strip->repeat))) {
/* this case prevents the motion snapping back
to the first frame at the end of the strip
* by catching the case where repeats is a
whole number, which means that the end of the strip
* could also be interpreted as the end of the
start of a repeat
@@ -453,7 +453,7 @@ static float nlastrip_get_frame_actionclip(NlaStrip *strip,
float cframe, short
return strip->actstart + (cframe - strip->start) /
scale;
}
else { /* if (mode == NLATIME_CONVERT_EVAL) */
- if (IS_EQF(cframe, strip->end) && IS_EQF(strip->repeat,
((int)strip->repeat))) {
+ if (IS_EQF(cframe, strip->end) && IS_EQF(strip->repeat,
floorf(strip->repeat))) {
/* this case prevents the motion snapping back
to the first frame at the end of the strip
* by catching the case where repeats is a
whole number, which means that the end of the strip
* could also be interpreted as the end of the
start of a repeat
diff --git a/source/blender/editors/armature/pose_lib.c
b/source/blender/editors/armature/pose_lib.c
index 27ca303..0609fcc 100644
--- a/source/blender/editors/armature/pose_lib.c
+++ b/source/blender/editors/armature/pose_lib.c
@@ -307,7 +307,7 @@ static int poselib_sanitize_exec(bContext *C, wmOperator
*op)
/* check if any pose matches this */
/* TODO: don't go looking through the list like this every
time... */
for (marker = act->markers.first; marker; marker =
marker->next) {
- if (IS_EQ(marker->frame, (double)ak->cfra)) {
+ if (IS_EQ((double)marker->frame, (double)ak->cfra)) {
marker->flag = -1;
break;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
