From 45079b169dc560dc3ff1ecaa8b040a5f7b5709ab Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 4 Mar 2022 15:21:18 +0100 Subject: [PATCH 1/2] Fix T96160: freezing when using multiple Handle Type Selection nodes Differential Revision: https://developer.blender.org/D14245 --- .../nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc | 1 - 1 file changed, 1 deletion(-) 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 e4e87e519f7..0d4a9ff8649 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 @@ -126,7 +126,6 @@ class HandleTypeFieldInput final : public GeometryFieldInput { bool is_equal_to(const fn::FieldNode &other) const override { - return dynamic_cast(&other) != nullptr; if (const HandleTypeFieldInput *other_handle_selection = dynamic_cast(&other)) { return mode_ == other_handle_selection->mode_ && type_ == other_handle_selection->type_; From 4681987d92c7de644fd3abddb726fa2300b59486 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Mon, 7 Mar 2022 07:46:24 +0100 Subject: [PATCH 2/2] Fix T96156: Snap to 3D cursor can't be undone Caused by oversight in 2bcf93bbbeb. Operator returns `OPERATOR_CANCELLED` when it should return `OPERATOR_FINISHED`. Reviewed By: mano-wii, campbellbarton Differential Revision: https://developer.blender.org/D14243 --- source/blender/editors/space_view3d/view3d_snap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 4334ede0a06..29e5917c7ed 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -616,9 +616,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)