[Bf-blender-cvs] [20a8d55bf35] sculpt-dev: Sculpt-dev: fix another merge error

[Joseph Eagar]

Commit: 20a8d55bf359c0677339221a095d8acfe022ae66
Author: Joseph Eagar
Date:   Tue Jan 25 16:51:22 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rB20a8d55bf359c0677339221a095d8acfe022ae66

Sculpt-dev: fix another merge error

===================================================================

M	source/blender/editors/geometry/geometry_attributes.cc

===================================================================

diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc
index 41bb1f2027d..934fcfd3ad1 100644
--- a/source/blender/editors/geometry/geometry_attributes.cc
+++ b/source/blender/editors/geometry/geometry_attributes.cc
@@ -506,6 +506,8 @@ static int geometry_attribute_convert_exec(bContext *C, wmOperator *op)
 
   DEG_id_tag_update(&mesh->id, ID_RECALC_GEOMETRY);
   WM_main_add_notifier(NC_GEOM | ND_DATA, &mesh->id);
+
+  return OPERATOR_FINISHED;
 }
 
 static void geometry_attribute_convert_ui(bContext *UNUSED(C), wmOperator *op)