[Bf-blender-cvs] [f1c8c25a3ed] blender2.8: UI: rename Translate/Grab to Move in UI, shortcuts stay the same.
Brecht Van Lommel
noreply at git.blender.org
Thu Sep 6 12:25:32 CEST 2018
Commit: f1c8c25a3edfbb03795250965ece9d39fef58356
Author: Brecht Van Lommel
Date: Thu Sep 6 12:13:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf1c8c25a3edfbb03795250965ece9d39fef58356
UI: rename Translate/Grab to Move in UI, shortcuts stay the same.
===================================================================
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_graph.py
M release/scripts/startup/bl_ui/space_nla.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_time.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/templates_py/gizmo_operator.py
M source/blender/editors/gizmo_library/CMakeLists.txt
M source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
R071 source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
M source/blender/editors/include/ED_gizmo_library.h
M source/blender/editors/mesh/editmesh_bisect.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/editors/mesh/editmesh_extrude_spin.c
M source/blender/editors/space_api/spacetypes.c
M source/blender/editors/space_node/node_gizmo.c
M source/blender/editors/space_view3d/view3d_gizmo_armature.c
M source/blender/editors/space_view3d/view3d_gizmo_lamp.c
M source/blender/editors/space_view3d/view3d_gizmo_navigate.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/transform/transform_ops.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_wm_gizmo.c
M source/blender/windowmanager/gizmo/WM_gizmo_types.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index f16a906f4cf..d10f96b8e81 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -489,7 +489,7 @@ class DOPESHEET_MT_key_transform(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("transform.transform", text="Grab/Move").mode = 'TIME_TRANSLATE'
+ layout.operator("transform.transform", text="Move").mode = 'TIME_TRANSLATE'
layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
layout.operator("transform.transform", text="Slide").mode = 'TIME_SLIDE'
layout.operator("transform.transform", text="Scale").mode = 'TIME_SCALE'
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index eacfb364130..9b3708ce5b1 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -306,7 +306,7 @@ class GRAPH_MT_key_transform(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
layout.operator("transform.rotate", text="Rotate")
layout.operator("transform.resize", text="Scale")
diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py
index 4e20001b133..c876f1f5a76 100644
--- a/release/scripts/startup/bl_ui/space_nla.py
+++ b/release/scripts/startup/bl_ui/space_nla.py
@@ -228,7 +228,7 @@ class NLA_MT_edit_transform(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("transform.translate", text="Grab/Move")
+ layout.operator("transform.translate", text="Move")
layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
layout.operator("transform.transform", text="Scale").mode = 'TIME_SCALE'
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 57c7f7cac14..f5f0edc7311 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -389,8 +389,8 @@ class SEQUENCER_MT_strip_transform(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("transform.transform", text="Grab/Move").mode = 'TRANSLATION'
- layout.operator("transform.transform", text="Grab/Extend from Frame").mode = 'TIME_EXTEND'
+ layout.operator("transform.transform", text="Move").mode = 'TRANSLATION'
+ layout.operator("transform.transform", text="Move/Extend from Frame").mode = 'TIME_EXTEND'
layout.operator("sequencer.slip", text="Slip Strip Contents")
layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index 7dc23550f52..10cd2f6d47b 100644
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -196,7 +196,7 @@ def marker_menu_generic(layout):
layout.separator()
layout.operator("marker.rename", text="Rename Marker")
- layout.operator("marker.move", text="Grab/Move Marker")
+ layout.operator("marker.move", text="Move Marker")
layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index c5feb485355..eb1b98a23e9 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -304,7 +304,7 @@ class _defs_transform:
layout.prop(tool_settings, "use_gizmo_apron")
return dict(
- text="Grab",
+ text="Move",
# cursor='SCROLL_XY',
icon="ops.transform.translate",
widget="TRANSFORM_GGT_gizmo",
diff --git a/release/scripts/templates_py/gizmo_operator.py b/release/scripts/templates_py/gizmo_operator.py
index bdc1bc9893c..d1eef09685d 100644
--- a/release/scripts/templates_py/gizmo_operator.py
+++ b/release/scripts/templates_py/gizmo_operator.py
@@ -114,20 +114,20 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
from mathutils import Matrix, Vector
# ----
- # Grab
+ # Move
- def grab_get_cb():
+ def move_get_cb():
op = SelectSideOfPlaneGizmoGroup.my_target_operator(context)
return op.plane_co
- def grab_set_cb(value):
+ def move_set_cb(value):
op = SelectSideOfPlaneGizmoGroup.my_target_operator(context)
op.plane_co = value
# XXX, this may change!
op.execute(context)
- mpr = self.gizmos.new("GIZMO_GT_grab_3d")
- mpr.target_set_handler("offset", get=grab_get_cb, set=grab_set_cb)
+ mpr = self.gizmos.new("GIZMO_GT_move_3d")
+ mpr.target_set_handler("offset", get=move_get_cb, set=move_set_cb)
mpr.use_draw_value = True
@@ -139,7 +139,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
mpr.scale_basis = 0.2
- self.widget_grab = mpr
+ self.widget_move = mpr
# ----
# Dial
@@ -189,12 +189,12 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
co = Vector(op.plane_co)
no = Vector(op.plane_no).normalized()
- # Grab
+ # Move
no_z = no
no_y = no_z.orthogonal()
no_x = no_z.cross(no_y)
- matrix = self.widget_grab.matrix_basis
+ matrix = self.widget_move.matrix_basis
matrix.identity()
matrix.col[0].xyz = no_x
matrix.col[1].xyz = no_y
diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt
index e1ea5c22ce5..f89c3c27522 100644
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -52,7 +52,7 @@ set(SRC
gizmo_types/cage2d_gizmo.c
gizmo_types/cage3d_gizmo.c
gizmo_types/dial3d_gizmo.c
- gizmo_types/grab3d_gizmo.c
+ gizmo_types/move3d_gizmo.c
gizmo_types/primitive3d_gizmo.c
)
diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
index da84c8217e7..cf0731664cb 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
@@ -1071,7 +1071,7 @@ static void GIZMO_GT_cage_2d(wmGizmoType *gzt)
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem rna_enum_transform[] = {
- {ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
+ {ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Move", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE, "ROTATE", 0, "Rotate", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE, "SCALE", 0, "Scale", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
index 79339b63777..5eb6c881755 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
@@ -664,7 +664,7 @@ static void GIZMO_GT_cage_3d(wmGizmoType *gzt)
{0, NULL, 0, NULL, NULL}
};
static EnumPropertyItem rna_enum_transform[] = {
- {ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
+ {ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE, "TRANSLATE", 0, "Move", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE, "SCALE", 0, "Scale", ""},
{ED_GIZMO_CAGE2D_XFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
similarity index 71%
rename from source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
rename to source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
index ad81bae6157..2c20852eb45 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
@@ -18,14 +18,14 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file grab3d_gizmo.c
+/** \file move3d_gizmo.c
* \ingroup wm
*
- * \name Grab Gizmo
+ * \name Move Gizmo
*
* 3D Gizmo, also works in 2D views.
*
- * \brief Simple gizmo to grab and translate.
+ * \brief Simple gizmo to move and translate.
*
* - `matrix[0]` is derived from Y and Z.
* - `matrix[1]` currently not used.
@@ -62,46 +62,46 @@
#include "../gizmo_geometry.h"
#include "../gizmo_library_intern.h"
-typedef struct GrabGizmo3D {
+typedef struct MoveGizmo3D {
wmGizmo gizmo;
/* Added to 'matrix_basis' when calculating the matrix. */
float prop_co[3];
-} GrabGizmo3D;
+} MoveGizmo3D;
-static void gizmo_grab_matrix_basis_get(const wmGizmo *gz, float r_matrix[4][4])
+static void gizmo_move_matrix_basis_get(const wmGizmo *gz, float r_matrix[4][4])
{
- GrabGizmo3D *grab = (GrabGizmo3D *)gz;
+ MoveGizmo3D *move = (MoveGizmo3D *)gz;
- copy_m4_m4(r_matrix, grab->gizmo.matrix_basis);
- add_v3_v3(r_matrix[3], grab->prop_co);
+ copy_m4_m4(r_matrix, move->gizmo.matrix_basis);
+ add_v3_v3(r_matrix[3], move->prop_co);
}
-static int gizmo_grab_modal(
+static int gizmo_move_modal(
bContext *C, wmGizmo *gz, const wmEvent *event,
eWM_GizmoFlagTweak tweak_flag);
-typedef struct GrabInteraction {
+typedef struct MoveInteraction {
float init_mval[2];
/* only for when using properties */
float init_prop_co[3];
float init_matrix_final[4][4];
-} GrabInteraction;
+} MoveInteraction;
#define DIAL_RESOLUTION 32
/* -------------------------------------------------------------------- */
-static void grab_geom_draw(
+static void move_geom_draw(
const wmGizmo *gz, c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list