blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v3.1-release'

This commit is contained in:
Richard Antalik 2022-03-07 07:49:52 +01:00
parent 8ec35c05b2 4681987d92
commit ad2948face
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_view3d/view3d_snap.c
View File

@ -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)

1
source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc
View File

@ -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_;