From d514b3b53b995ba092dcc4eb7b1f7be205ae3fdc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 1 Apr 2024 22:16:23 +1100 Subject: [PATCH] Cleanup: use explicit casts when assigning booleans to floats While valid, this isn't so common and cppcheck warns about this, use explicit casts to suppress the warning, also correct "true" being assigned to a float value. --- source/blender/editors/animation/keyframes_general.cc | 4 ++-- source/blender/editors/armature/pose_slide.cc | 4 ++-- .../editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc | 2 +- source/blender/editors/interface/interface.cc | 4 ++-- source/blender/python/intern/bpy_driver.cc | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/blender/editors/animation/keyframes_general.cc b/source/blender/editors/animation/keyframes_general.cc index 81dc82bf632..d855e4a327b 100644 --- a/source/blender/editors/animation/keyframes_general.cc +++ b/source/blender/editors/animation/keyframes_general.cc @@ -342,10 +342,10 @@ float get_default_rna_value(FCurve *fcu, PropertyRNA *prop, PointerRNA *ptr) switch (RNA_property_type(prop)) { case PROP_BOOLEAN: if (len) { - default_value = RNA_property_boolean_get_default_index(ptr, prop, fcu->array_index); + default_value = float(RNA_property_boolean_get_default_index(ptr, prop, fcu->array_index)); } else { - default_value = RNA_property_boolean_get_default(ptr, prop); + default_value = float(RNA_property_boolean_get_default(ptr, prop)); } break; case PROP_INT: diff --git a/source/blender/editors/armature/pose_slide.cc b/source/blender/editors/armature/pose_slide.cc index d356918a00a..95b41c82f59 100644 --- a/source/blender/editors/armature/pose_slide.cc +++ b/source/blender/editors/armature/pose_slide.cc @@ -539,10 +539,10 @@ static void pose_slide_apply_props(tPoseSlideOp *pso, if (UNLIKELY(uint(fcu->array_index) >= RNA_property_array_length(&ptr, prop))) { break; /* Out of range, skip. */ } - tval = RNA_property_boolean_get_index(&ptr, prop, fcu->array_index); + tval = float(RNA_property_boolean_get_index(&ptr, prop, fcu->array_index)); } else { - tval = RNA_property_boolean_get(&ptr, prop); + tval = float(RNA_property_boolean_get(&ptr, prop)); } pose_slide_apply_val(pso, fcu, pfl->ob, &tval); diff --git a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc index 30a9cf76264..22655c17fbe 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc @@ -223,7 +223,7 @@ static void gizmo_primitive_setup(wmGizmo *gz) /* Default Values. */ PrimitiveGizmo3D *gz_prim = (PrimitiveGizmo3D *)gz; gz_prim->draw_style = ED_GIZMO_PRIMITIVE_STYLE_PLANE; - gz_prim->arc_inner_factor = true; + gz_prim->arc_inner_factor = 1.0f; gz_prim->draw_inner = true; } diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 148d8b4a8d0..4538e84207f 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -2515,10 +2515,10 @@ double ui_but_value_get(uiBut *but) switch (RNA_property_type(prop)) { case PROP_BOOLEAN: if (RNA_property_array_check(prop)) { - value = RNA_property_boolean_get_index(&but->rnapoin, prop, but->rnaindex); + value = double(RNA_property_boolean_get_index(&but->rnapoin, prop, but->rnaindex)); } else { - value = RNA_property_boolean_get(&but->rnapoin, prop); + value = double(RNA_property_boolean_get(&but->rnapoin, prop)); } break; case PROP_INT: diff --git a/source/blender/python/intern/bpy_driver.cc b/source/blender/python/intern/bpy_driver.cc index 42b4db9e710..f4b0e29ddb5 100644 --- a/source/blender/python/intern/bpy_driver.cc +++ b/source/blender/python/intern/bpy_driver.cc @@ -633,7 +633,7 @@ float BPY_driver_exec(PathResolvedRNA *anim_rna, dvar->curval = float(PyLong_AsLong(driver_arg)); } else if (PyBool_Check(driver_arg)) { - dvar->curval = (driver_arg == Py_True); + dvar->curval = float(driver_arg == Py_True); } else { dvar->curval = 0.0f;