[Bf-blender-cvs] [4f877e831f7] soc-2021-curves: Reverted curve pen add

dilithjay noreply at git.blender.org
Sat Nov 6 08:49:09 CET 2021


Commit: 4f877e831f7984d5890e634de65ef27e19998a39
Author: dilithjay
Date:   Sat Nov 6 13:18:55 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB4f877e831f7984d5890e634de65ef27e19998a39

Reverted curve pen add

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

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	source/blender/editors/curve/editcurve_pen.c

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

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index b070c17419f..809487e6757 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -6997,9 +6997,9 @@ def km_3d_view_tool_edit_curve_pen(params):
         "3D View Tool: Edit Curve, Curve Pen",
         {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
         {"items": [
-            ("curve.pen_add", {"type": params.tool_mouse, "value": 'PRESS'},
+            ("curve.pen", {"type": params.tool_mouse, "value": 'PRESS'},
              {"properties": [("wait_for_input", False), ("cut_or_delete", False)]}),
-            ("curve.pen_delete", {"type": params.tool_mouse, "value": 'PRESS', "ctrl": True},
+            ("curve.pen", {"type": params.tool_mouse, "value": 'PRESS', "ctrl": True},
              {"properties": [("cut_or_delete", True)]}),
         ]},
     )
diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c
index 4f6b718f9e7..d70a7fb2133 100644
--- a/source/blender/editors/curve/editcurve_pen.c
+++ b/source/blender/editors/curve/editcurve_pen.c
@@ -829,7 +829,7 @@ static bool make_cyclic_if_endpoints(
 }
 
 enum {
-  PEN_MODAL_FREE_MOVE_HANDLE=1,
+  PEN_MODAL_FREE_MOVE_HANDLE = 1,
 };
 
 wmKeyMap *curve_pen_modal_keymap(wmKeyConfig *keyconf)
@@ -1038,7 +1038,7 @@ void CURVE_OT_pen(wmOperatorType *ot)
 {
   /* identifiers */
   ot->name = "Curve Pen";
-  ot->idname = "CURVE_OT_pen_add";
+  ot->idname = "CURVE_OT_pen";
   ot->description = "Construct and edit splines";
 
   /* api callbacks */



More information about the Bf-blender-cvs mailing list