diff options
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 6 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_common.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 | ||||
| -rw-r--r-- | release/scripts/templates_py/gizmo_operator_target.py | 2 | ||||
| -rw-r--r-- | release/scripts/templates_py/gizmo_simple.py | 2 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_brush.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index bfa8a295f5b..6c631891418 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -334,9 +334,9 @@ except ImportError: # to avoid having to match Blender's source tree. EXTRA_SOURCE_FILES = ( "../../../release/scripts/templates_py/bmesh_simple.py", - "../../../release/scripts/templates_py/manipulator_operator.py", - "../../../release/scripts/templates_py/manipulator_operator_target.py", - "../../../release/scripts/templates_py/manipulator_simple.py", + "../../../release/scripts/templates_py/gizmo_operator.py", + "../../../release/scripts/templates_py/gizmo_operator_target.py", + "../../../release/scripts/templates_py/gizmo_simple.py", "../../../release/scripts/templates_py/operator_simple.py", "../../../release/scripts/templates_py/ui_panel_simple.py", "../../../release/scripts/templates_py/ui_previews_custom_icon.py", diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py index 4c954874f0d..4f6e42d4a98 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_common.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py @@ -74,7 +74,7 @@ ToolDef = namedtuple( "icon", # An optional cursor to use when this tool is active. "cursor", - # An optional manipulator group to activate when the tool is set or None for no widget. + # An optional gizmo group to activate when the tool is set or None for no gizmo. "widget", # Optional keymap for tool, either: # - A function that populates a keymaps passed in as an argument. diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 682af76500b..36bfe5ec65e 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -51,7 +51,7 @@ class VIEW3D_HT_header(Header): layout.template_header_3D_mode() - # Contains buttons like Mode, Pivot, Manipulator, Layer, Mesh Select Mode... + # Contains buttons like Mode, Pivot, Layer, Mesh Select Mode... shading_type = view.shading.type shading_item = bpy.types.View3DShading.bl_rna.properties["type"].enum_items[shading_type] diff --git a/release/scripts/templates_py/gizmo_operator_target.py b/release/scripts/templates_py/gizmo_operator_target.py index 28465ad2fa5..606aa6749d0 100644 --- a/release/scripts/templates_py/gizmo_operator_target.py +++ b/release/scripts/templates_py/gizmo_operator_target.py @@ -24,7 +24,7 @@ class MyCameraWidgetGroup(GizmoGroup): def setup(self, context): # Run an operator using the dial gizmo ob = context.object - mpr = self.gizmos.new("GIZMO_GGT_dial_3d") + mpr = self.gizmos.new("GIZMO_GT_dial_3d") props = mpr.target_set_operator("transform.rotate") props.constraint_axis = False, False, True props.constraint_orientation = 'LOCAL' diff --git a/release/scripts/templates_py/gizmo_simple.py b/release/scripts/templates_py/gizmo_simple.py index df80acea0ae..396378da04c 100644 --- a/release/scripts/templates_py/gizmo_simple.py +++ b/release/scripts/templates_py/gizmo_simple.py @@ -25,7 +25,7 @@ class MyLightWidgetGroup(GizmoGroup): def setup(self, context): # Arrow gizmo has one 'offset' property we can assign to the light energy. ob = context.object - mpr = self.gizmos.new("GIZMO_GGT_arrow_3d") + mpr = self.gizmos.new("GIZMO_GT_arrow_3d") mpr.target_set_prop("offset", ob.data, "energy") mpr.matrix_basis = ob.matrix_world.normalized() mpr.draw_style = 'BOX' diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index 0ddd8700c09..a8810df35ff 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -1832,7 +1832,7 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even case DOWNARROWKEY: return OPERATOR_PASS_THROUGH; - /* Camera/View Manipulations - Allowed */ + /* Camera/View Gizmo's - Allowed */ /* (See rationale in gpencil_paint.c -> gpencil_draw_modal()) */ case PAD0: case PAD1: case PAD2: case PAD3: case PAD4: case PAD5: case PAD6: case PAD7: case PAD8: case PAD9: |