diff --git a/source/blender/animrig/intern/keyframing.cc b/source/blender/animrig/intern/keyframing.cc index 1918d186f2d..1c6d3a47c15 100644 --- a/source/blender/animrig/intern/keyframing.cc +++ b/source/blender/animrig/intern/keyframing.cc @@ -891,14 +891,14 @@ static CombinedKeyingResult insert_key_layered_action( Main *bmain, Action &action, Layer &layer, - Slot &slot, + const Slot &slot, PropertyRNA *prop, const std::optional channel_group, const std::string &rna_path, const float frame, const Span values, const eInsertKeyFlags insert_key_flags, - const KeyframeSettings key_settings, + const KeyframeSettings &key_settings, const BitSpan keying_mask) { BLI_assert(bmain != nullptr); diff --git a/source/blender/editors/space_file/file_ops.cc b/source/blender/editors/space_file/file_ops.cc index 9f789f74785..6aa119f00f6 100644 --- a/source/blender/editors/space_file/file_ops.cc +++ b/source/blender/editors/space_file/file_ops.cc @@ -2874,7 +2874,7 @@ void file_directory_enter_handle(bContext *C, void * /*arg_unused*/, void * /*ar return; } - Main *bmain = CTX_data_main(C); + const Main *bmain = CTX_data_main(C); char old_dir[sizeof(params->dir)]; STRNCPY(old_dir, params->dir); @@ -2961,7 +2961,7 @@ void file_filename_enter_handle(bContext *C, void * /*arg_unused*/, void *arg_bu return; } - Main *bmain = CTX_data_main(C); + const Main *bmain = CTX_data_main(C); uiBut *but = static_cast(arg_but); file_expand_directory(bmain, params); diff --git a/source/blender/editors/util/numinput.cc b/source/blender/editors/util/numinput.cc index a6d7f2e5cf0..e23dc8572ab 100644 --- a/source/blender/editors/util/numinput.cc +++ b/source/blender/editors/util/numinput.cc @@ -286,7 +286,7 @@ bool user_string_to_number(bContext *C, return BPY_run_string_as_number(C, nullptr, str_unit_convert, &err_info, r_value); } - int success = BPY_run_string_as_number(C, nullptr, str, &err_info, r_value); + bool success = BPY_run_string_as_number(C, nullptr, str, &err_info, r_value); *r_value = BKE_unit_apply_preferred_unit(unit, type, *r_value); *r_value /= unit_scale; return success; diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index 5b201454e0b..87fda6d48d2 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -593,7 +593,7 @@ float AnimationImporter::convert_to_focal_length(float in_xfov, void AnimationImporter::Assign_lens_animations(const COLLADAFW::UniqueId &listid, AnimData &adt, const double aspect, - Camera *cam, + const Camera *cam, const char *anim_type, int fov_type) { @@ -841,7 +841,6 @@ void AnimationImporter::translate_Animations( } AnimationImporter::AnimMix *animType = get_animation_type(node, FW_object_map); - bAction *act; Main *bmain = CTX_data_main(mContext); if ((animType->transform) != 0) { diff --git a/source/blender/io/collada/AnimationImporter.h b/source/blender/io/collada/AnimationImporter.h index e9204bd485c..f0b3156a120 100644 --- a/source/blender/io/collada/AnimationImporter.h +++ b/source/blender/io/collada/AnimationImporter.h @@ -185,7 +185,7 @@ class AnimationImporter : private TransformReader, public AnimationImporterBase void Assign_lens_animations(const COLLADAFW::UniqueId &listid, AnimData &adt, double aspect, - Camera *cam, + const Camera *cam, const char *anim_type, int fov_type);