sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Gizmo: update Python templates

Browse Source
This commit is contained in:
Campbell Barton 2018-07-15 19:49:07 +02:00
parent 57ab7daa2a
commit b29b73a67e
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/python_api/sphinx_doc_gen.py
View File

@ -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",

2
release/scripts/startup/bl_ui/space_toolsystem_common.py
View File

@ -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.

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -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]

2
release/scripts/templates_py/gizmo_operator_target.py
View File

@ -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'

2
release/scripts/templates_py/gizmo_simple.py
View File

@ -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'

2
source/blender/editors/gpencil/gpencil_brush.c
View File

@ -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: