diff options
7 files changed, 26 insertions, 24 deletions
diff --git a/doc/python_api/examples/gpu.types.GPUOffScreen.py b/doc/python_api/examples/gpu.types.GPUOffScreen.py index d927e393b96..aa9514d11b2 100644 --- a/doc/python_api/examples/gpu.types.GPUOffScreen.py +++ b/doc/python_api/examples/gpu.types.GPUOffScreen.py @@ -33,9 +33,9 @@ void main() g_plane_vertices = np.array([ ([-1.0, -1.0], [0.0, 0.0]), ([1.0, -1.0], [1.0, 0.0]), - ([1.0, 1.0], [1.0, 1.0]), - ([1.0, 1.0], [1.0, 1.0]), - ([-1.0, 1.0], [0.0, 1.0]), + ([1.0, 1.0], [1.0, 1.0]), + ([1.0, 1.0], [1.0, 1.0]), + ([-1.0, 1.0], [0.0, 1.0]), ([-1.0, -1.0], [0.0, 0.0]), ], [('pos', 'f4', 2), ('uv', 'f4', 2)]) @@ -162,20 +162,20 @@ class VIEW3D_OT_draw_offscreen(bpy.types.Operator): format = gpu.types.GPUVertFormat() pos_id = format.attr_add( - id="pos", - comp_type="F32", - len=2, - fetch_mode="FLOAT") + id="pos", + comp_type="F32", + len=2, + fetch_mode="FLOAT") uv_id = format.attr_add( - id="texCoord", - comp_type="F32", - len=2, - fetch_mode="FLOAT") + id="texCoord", + comp_type="F32", + len=2, + fetch_mode="FLOAT") vbo = gpu.types.GPUVertBuf( - len=len(g_plane_vertices), - format=format) + len=len(g_plane_vertices), + format=format) vbo.fill(id=pos_id, data=g_plane_vertices["pos"]) vbo.fill(id=uv_id, data=g_plane_vertices["uv"]) diff --git a/release/scripts/startup/bl_operators/uvcalc_follow_active.py b/release/scripts/startup/bl_operators/uvcalc_follow_active.py index 38af5c69ef9..58d60426464 100644 --- a/release/scripts/startup/bl_operators/uvcalc_follow_active.py +++ b/release/scripts/startup/bl_operators/uvcalc_follow_active.py @@ -25,10 +25,11 @@ import bpy from bpy.types import Operator -STATUS_OK = (1 << 0) -STATUS_ERR_ACTIVE_FACE = (1 << 1) +STATUS_OK = (1 << 0) +STATUS_ERR_ACTIVE_FACE = (1 << 1) STATUS_ERR_NOT_SELECTED = (1 << 2) -STATUS_ERR_NOT_QUAD = (1 << 3) +STATUS_ERR_NOT_QUAD = (1 << 3) + def extend(obj, operator, EXTEND_MODE): import bmesh diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index c31c982eb87..188b0fbd65a 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -267,12 +267,12 @@ class GreasePencilStrokeSculptPanel: layout.row().prop(brush, "direction", expand=True) elif tool == 'PINCH': row = layout.row(align=True) - row.prop_enum(brush, "direction", value='ADD', text="Pinch") - row.prop_enum(brush, "direction", value='SUBTRACT', text="Inflate") + row.prop_enum(brush, "direction", value='ADD', text="Pinch") + row.prop_enum(brush, "direction", value='SUBTRACT', text="Inflate") elif settings.tool == 'TWIST': row = layout.row(align=True) - row.prop_enum(brush, "direction", value='ADD', text="CCW") - row.prop_enum(brush, "direction", value='SUBTRACT', text="CW") + row.prop_enum(brush, "direction", value='ADD', text="CCW") + row.prop_enum(brush, "direction", value='SUBTRACT', text="CW") class GreasePencilSculptOptionsPanel: diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py index c9cdd955ec7..933449c5adb 100644 --- a/release/scripts/startup/bl_ui/properties_material_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py @@ -147,8 +147,8 @@ class MATERIAL_PT_gpencil_slots(Panel): if gpd.use_stroke_edit_mode: row = layout.row(align=True) row.operator("gpencil.stroke_change_color", text="Assign") - row.operator("gpencil.color_select", text="Select").deselect=False - row.operator("gpencil.color_select", text="Deselect").deselect=True + row.operator("gpencil.color_select", text="Select").deselect = False + row.operator("gpencil.color_select", text="Deselect").deselect = True elif mat: row.template_ID(space, "pin_id") diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 81feab206ed..05baf619b7c 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1438,6 +1438,7 @@ class CLIP_MT_stabilize_2d_rotation_specials(Menu): layout.operator("clip.stabilize_2d_rotation_select") + class CLIP_MT_pivot_pie(Menu): bl_label = "Pivot Point" @@ -1451,7 +1452,6 @@ class CLIP_MT_pivot_pie(Menu): pie.prop_enum(context.space_data, "pivot_point", value='MEDIAN_POINT') - classes = ( CLIP_UL_tracking_objects, CLIP_HT_header, diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index 69413d46c1f..38b6aef99ac 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -232,6 +232,7 @@ class NLA_MT_edit_transform(Menu): layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND' layout.operator("transform.transform", text="Scale").mode = 'TIME_SCALE' + class NLA_MT_snap_pie(Menu): bl_label = "Snap" diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 8a3442f35e5..6877a45013a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3822,7 +3822,6 @@ class VIEW3D_MT_pivot_pie(Menu): pie.prop(context.scene.tool_settings, "use_transform_pivot_point_align", text="Center Points Only") - class VIEW3D_MT_orientations_pie(Menu): bl_label = "Orientation" @@ -3851,6 +3850,7 @@ class VIEW3D_MT_snap_pie(Menu): pie.operator("view3d.snap_cursor_to_center", text="Cursor to Center", icon='CURSOR') pie.operator("view3d.snap_cursor_to_active", text="Cursor to Active", icon='CURSOR') + class VIEW3D_MT_proportional_editing_falloff_pie(Menu): bl_label = "Proportional Editing Falloff" |