[Bf-blender-cvs] [2c1536422e0] transform-snap-base: Rename "Edit Snap With" to "Edit Snap Point"

[Germano Cavalcante]

Commit: 2c1536422e0b91b93d284d46c7d23cf6d52d9f57
Author: Germano Cavalcante
Date:   Mon Nov 23 14:54:23 2020 -0300
Branches: transform-snap-base
https://developer.blender.org/rB2c1536422e0b91b93d284d46c7d23cf6d52d9f57

Rename "Edit Snap With" to "Edit Snap Point"

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

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform.h

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

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 902a20f5327..5188c016fc2 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5039,7 +5039,7 @@ def km_transform_modal_map(_params):
         ("INSERTOFS_TOGGLE_DIR", {"type": 'T', "value": 'PRESS'}, None),
         ("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
         ("AUTOCONSTRAINPLANE", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
-        ("EDIT_SNAPWITH", {"type": 'B', "value": 'PRESS'}, None),
+        ("EDIT_SNAP_POINT", {"type": 'B', "value": 'PRESS'}, None),
     ])
 
     return keymap
diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
index 1c91d9ef6ed..85643031fbd 100644
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@ -3944,7 +3944,7 @@ def km_transform_modal_map(_params):
         ("INSERTOFS_TOGGLE_DIR", {"type": 'T', "value": 'PRESS'}, None),
         ("AUTOCONSTRAIN", {"type": 'MIDDLEMOUSE', "value": 'PRESS'}, None),
         ("AUTOCONSTRAINPLANE", {"type": 'MIDDLEMOUSE', "value": 'PRESS', "shift": True}, None),
-        ("EDIT_SNAPWITH", {"type": 'B', "value": 'PRESS'}, None),
+        ("EDIT_SNAP_POINT", {"type": 'B', "value": 'PRESS'}, None),
     ])
 
     return keymap
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 10151291fa0..67771493316 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -574,7 +574,7 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
              TFM_MODAL_SNAP_INV_OFF,
              TFM_MODAL_ADD_SNAP,
              TFM_MODAL_REMOVE_SNAP,
-             TFM_MODAL_EDIT_SNAPWITH)) {
+             TFM_MODAL_EDIT_SNAP_POINT)) {
       return true;
     }
     return false;
@@ -650,7 +650,7 @@ static bool transform_modal_item_poll(const wmOperator *op, int value)
       }
       break;
     }
-    case TFM_MODAL_EDIT_SNAPWITH: {
+    case TFM_MODAL_EDIT_SNAP_POINT: {
       if (t->spacetype != SPACE_VIEW3D) {
         return false;
       }
@@ -705,7 +705,7 @@ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf)
       {TFM_MODAL_RESIZE, "RESIZE", 0, "Resize", ""},
       {TFM_MODAL_AUTOCONSTRAINT, "AUTOCONSTRAIN", 0, "Automatic Constraint", ""},
       {TFM_MODAL_AUTOCONSTRAINTPLANE, "AUTOCONSTRAINPLANE", 0, "Automatic Constraint Plane", ""},
-      {TFM_MODAL_EDIT_SNAPWITH, "EDIT_SNAPWITH", 0, "Edit snap with", ""},
+      {TFM_MODAL_EDIT_SNAP_POINT, "EDIT_SNAP_POINT", 0, "Edit Snap Point", ""},
       {0, NULL, 0, NULL, NULL},
   };
 
@@ -1136,7 +1136,7 @@ int transformEvent(TransInfo *t, const wmEvent *event)
           handled = true;
         }
         break;
-      case TFM_MODAL_EDIT_SNAPWITH:
+      case TFM_MODAL_EDIT_SNAP_POINT:
         tranform_snap_editbasepoint_toggle(t);
         break;
       /* Those two are only handled in transform's own handler, see T44634! */
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 3fd4bacec28..f542d53d292 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -598,7 +598,7 @@ enum {
   TFM_MODAL_AUTOCONSTRAINT = 28,
   TFM_MODAL_AUTOCONSTRAINTPLANE = 29,
 
-  TFM_MODAL_EDIT_SNAPWITH = 30,
+  TFM_MODAL_EDIT_SNAP_POINT = 30,
 };
 
 /** \} */