diff options
| author | Antonioya <blendergit@gmail.com> | 2018-12-02 02:05:01 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-12-02 02:05:01 +0300 |
| commit | 5d4073e248dc9e25003727705e7266699f26e017 (patch) | |
| tree | e376e7fdb6062d63a2a2ea8600d72514dff7d2ef /release | |
| parent | 783d8d4adfe3092a9a98442c02f028a4454b4737 (diff) | |
Fix T58460: Proportional edit icon disappears
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index eb0892503a6..383f1938cd2 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -176,16 +176,7 @@ class VIEW3D_HT_header(Header): # Proportional editing if obj: gpd = context.gpencil_data - if gpd is not None and obj.type == 'GPENCIL': - if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode: - row = layout.row(align=True) - row.prop(tool_settings, "proportional_edit", icon_only=True) - - sub = row.row(align=True) - sub.active = tool_settings.proportional_edit != 'DISABLED' - sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True) - - elif object_mode in {'EDIT', 'PARTICLE_EDIT'}: + if object_mode in {'EDIT', 'PARTICLE_EDIT'}: row = layout.row(align=True) row.prop(tool_settings, "proportional_edit", icon_only=True) sub = row.row(align=True) @@ -198,6 +189,15 @@ class VIEW3D_HT_header(Header): sub = row.row(align=True) sub.active = tool_settings.use_proportional_edit_objects sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True) + + elif gpd is not None and obj.type == 'GPENCIL': + if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode: + row = layout.row(align=True) + row.prop(tool_settings, "proportional_edit", icon_only=True) + + sub = row.row(align=True) + sub.active = tool_settings.proportional_edit != 'DISABLED' + sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True) else: if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode: row = layout.row(align=True) |