[Bf-blender-cvs] [1e38e32cf6d] master: Cleanup: type check failure, discarded-qualifiers warnings
Campbell Barton
noreply at git.blender.org
Tue Dec 15 00:27:54 CET 2020
Commit: 1e38e32cf6d6f24a0c9af27a0331c06037b68fd9
Author: Campbell Barton
Date: Tue Dec 15 10:23:12 2020 +1100
Branches: master
https://developer.blender.org/rB1e38e32cf6d6f24a0c9af27a0331c06037b68fd9
Cleanup: type check failure, discarded-qualifiers warnings
Caused by 7f6ffe9195c105a2ed9776b907aa2e6e34ed4bf3
===================================================================
M source/blender/blenkernel/intern/anim_sys.c
===================================================================
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 0476fd1e244..ea41495d097 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1189,7 +1189,7 @@ static void nlaeval_free(NlaEvalData *nlaeval)
/* ---------------------- */
-static int nlaevalchan_validate_index(NlaEvalChannel *nec, int index)
+static int nlaevalchan_validate_index(const NlaEvalChannel *nec, int index)
{
if (nec->is_array) {
if (index >= 0 && index < nec->base_snapshot.length) {
@@ -1494,7 +1494,7 @@ static bool nla_invert_blend_value(
int blend_mode, float old_value, float target_value, float influence, float *r_value)
{
/** No solution if strip had 0 influence. */
- if (IS_EQF(0, influence)) {
+ if (IS_EQF(influence, 0.0f)) {
return false;
}
@@ -1542,7 +1542,7 @@ static bool nla_invert_combine_value(int mix_mode,
float *r_value)
{
/* No solution if strip had no influence. */
- if (IS_EQF(influence, 0)) {
+ if (IS_EQF(influence, 0.0f)) {
return false;
}
@@ -1597,7 +1597,7 @@ static bool nla_invert_combine_quaternion(const float old_values[4],
float influence,
float result[4])
{
- if (IS_EQF(influence, 0)) {
+ if (IS_EQF(influence, 0.0f)) {
return false;
}
float tmp_old[4], tmp_new[4];
More information about the Bf-blender-cvs
mailing list