From 70b705b5fecc94df9fdc5a5c69c10a9249f8e49c Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Wed, 6 Jun 2018 12:00:04 -0400 Subject: UI: NLA: Influence should be a factor (RNA) --- source/blender/makesrna/intern/rna_animation.c | 2 +- source/blender/makesrna/intern/rna_nla.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 6779e74700d..3f8a7bc96e8 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -1042,7 +1042,7 @@ static void rna_def_animdata(BlenderRNA *brna) "Method used for combining Active Action's result with result of NLA stack"); RNA_def_property_update(prop, NC_ANIMATION | ND_NLA, NULL); /* this will do? */ - prop = RNA_def_property(srna, "action_influence", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "action_influence", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "act_influence"); RNA_def_property_float_default(prop, 1.0f); RNA_def_property_range(prop, 0.0f, 1.0f); diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index f1c02896447..ce2fba37053 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -656,7 +656,7 @@ static void rna_def_nlastrip(BlenderRNA *brna) "NLA Strips that this strip acts as a container for (if it is of type Meta)"); /* Settings - Values necessary for evaluation */ - prop = RNA_def_property(srna, "influence", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "influence", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Influence", "Amount the strip contributes to the current result"); /* XXX: Update temporarily disabled so that the property can be edited at all! -- cgit v1.2.3 From 0e68751b8a0bac59a275b1fe3d818b8259d1cc7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 6 Jun 2018 19:49:27 +0200 Subject: Fix BLI_ASSERT_UNIT macro w/ non-finite numbers --- source/blender/blenlib/BLI_math_base.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'source') diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 6f8e48d83b2..f455436ce63 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -200,24 +200,28 @@ double double_round(double x, int ndigits); * check the vector is unit length, or zero length (which can't be helped in some cases). */ #ifndef NDEBUG -/* note: 0.0001 is too small becaues normals may be converted from short's: see [#34322] */ +/** \note 0.0001 is too small becaues normals may be converted from short's: see T34322. */ # define BLI_ASSERT_UNIT_EPSILON 0.0002f +/** + * \note Checks are flipped so NAN doesn't assert. This is done because we're making sure the value was normalized + * and in the case we don't want NAN to be raising asserts since there is nothing to be done in that case. + */ # define BLI_ASSERT_UNIT_V3(v) { \ const float _test_unit = len_squared_v3(v); \ - BLI_assert((fabsf(_test_unit - 1.0f) < BLI_ASSERT_UNIT_EPSILON) || \ - (fabsf(_test_unit) < BLI_ASSERT_UNIT_EPSILON)); \ + BLI_assert(!(fabsf(_test_unit - 1.0f) >= BLI_ASSERT_UNIT_EPSILON) || \ + !(fabsf(_test_unit) >= BLI_ASSERT_UNIT_EPSILON)); \ } (void)0 # define BLI_ASSERT_UNIT_V2(v) { \ const float _test_unit = len_squared_v2(v); \ - BLI_assert((fabsf(_test_unit - 1.0f) < BLI_ASSERT_UNIT_EPSILON) || \ - (fabsf(_test_unit) < BLI_ASSERT_UNIT_EPSILON)); \ + BLI_assert(!(fabsf(_test_unit - 1.0f) >= BLI_ASSERT_UNIT_EPSILON) || \ + !(fabsf(_test_unit) >= BLI_ASSERT_UNIT_EPSILON)); \ } (void)0 # define BLI_ASSERT_UNIT_QUAT(q) { \ const float _test_unit = dot_qtqt(q, q); \ - BLI_assert((fabsf(_test_unit - 1.0f) < BLI_ASSERT_UNIT_EPSILON * 10) || \ - (fabsf(_test_unit) < BLI_ASSERT_UNIT_EPSILON * 10)); \ + BLI_assert(!(fabsf(_test_unit - 1.0f) >= BLI_ASSERT_UNIT_EPSILON * 10) || \ + !(fabsf(_test_unit) >= BLI_ASSERT_UNIT_EPSILON * 10)); \ } (void)0 # define BLI_ASSERT_ZERO_M3(m) { \ -- cgit v1.2.3