From 7f2beb79c656bcacc7d0492da13df8379cf44311 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Mon, 21 Feb 2022 11:57:43 +0100 Subject: Cleanup: move curves sculpt mode toggle operator to sculpt/paint module This is necessary, because the operator will have to use functions that are currently private within this module. E.g. `paint_cursor_start`. --- source/blender/editors/curves/intern/curves_ops.cc | 66 ---------------------- 1 file changed, 66 deletions(-) (limited to 'source/blender/editors/curves') diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index 0aa8c4b253e..52a55ae1760 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -4,74 +4,8 @@ * \ingroup edcurves */ -#include "BLI_utildefines.h" - #include "ED_curves.h" -#include "ED_object.h" - -#include "WM_api.h" -#include "WM_toolsystem.h" -#include "WM_types.h" - -#include "BKE_context.h" -#include "BKE_paint.h" - -#include "DNA_scene_types.h" - -#include "RNA_access.h" -#include "RNA_define.h" -#include "RNA_types.h" - -static bool curves_sculptmode_toggle_poll(bContext *C) -{ - Object *ob = CTX_data_active_object(C); - if (ob == nullptr) { - return false; - } - if (ob->type != OB_CURVES) { - return false; - } - return true; -} - -static int curves_sculptmode_toggle_exec(bContext *C, wmOperator *op) -{ - Scene *scene = CTX_data_scene(C); - Object *ob = CTX_data_active_object(C); - const bool is_mode_set = ob->mode == OB_MODE_SCULPT_CURVES; - - if (is_mode_set) { - if (!ED_object_mode_compat_set(C, ob, OB_MODE_SCULPT_CURVES, op->reports)) { - return OPERATOR_CANCELLED; - } - } - - if (is_mode_set) { - ob->mode = OB_MODE_OBJECT; - } - else { - BKE_paint_ensure(scene->toolsettings, (Paint **)&scene->toolsettings->curves_sculpt); - ob->mode = OB_MODE_SCULPT_CURVES; - } - - WM_toolsystem_update_from_context_view3d(C); - WM_event_add_notifier(C, NC_SCENE | ND_MODE, nullptr); - return OPERATOR_CANCELLED; -} - -static void CURVES_OT_sculptmode_toggle(wmOperatorType *ot) -{ - ot->name = "Curve Sculpt Mode Toggle"; - ot->idname = "CURVES_OT_sculptmode_toggle"; - ot->description = "Enter/Exit sculpt mode for curves"; - - ot->exec = curves_sculptmode_toggle_exec; - ot->poll = curves_sculptmode_toggle_poll; - - ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER; -} void ED_operatortypes_curves() { - WM_operatortype_append(CURVES_OT_sculptmode_toggle); } -- cgit v1.2.3