diff options
author | Richard Antalik <richardantalik@gmail.com> | 2022-03-07 09:49:52 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2022-03-07 09:49:52 +0300 |
commit | ad2948face07abdfb11e236f7f4db08c5dbcac5a (patch) | |
tree | 06c69be5487ecaa9ec3fd2d96a3e65870a4b8cd3 /source | |
parent | 8ec35c05b2fe40f23fe9be9d95b03622c844b4f2 (diff) | |
parent | 4681987d92c7de644fd3abddb726fa2300b59486 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 4 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index bcdc962a860..2f51b2dce3b 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -600,9 +600,9 @@ static int snap_selected_to_cursor_exec(bContext *C, wmOperator *op) const int pivot_point = scene->toolsettings->transform_pivot_point; if (snap_selected_to_location(C, snap_target_global, use_offset, pivot_point, true)) { - return OPERATOR_CANCELLED; + return OPERATOR_FINISHED; } - return OPERATOR_FINISHED; + return OPERATOR_CANCELLED; } void VIEW3D_OT_snap_selected_to_cursor(wmOperatorType *ot) diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc index ccd3a587e63..0aa603a7736 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc @@ -112,7 +112,6 @@ class HandleTypeFieldInput final : public GeometryFieldInput { bool is_equal_to(const fn::FieldNode &other) const override { - return dynamic_cast<const HandleTypeFieldInput *>(&other) != nullptr; if (const HandleTypeFieldInput *other_handle_selection = dynamic_cast<const HandleTypeFieldInput *>(&other)) { return mode_ == other_handle_selection->mode_ && type_ == other_handle_selection->type_; |