diff options
| author | William Reynish <billrey@me.com> | 2019-03-06 16:59:09 +0300 |
|---|---|---|
| committer | William Reynish <billrey@me.com> | 2019-03-06 16:59:09 +0300 |
| commit | 8f7e24710ef1718a73565abc5c3880477574a25d (patch) | |
| tree | 99b1928fa38b8f9cd59560ace36692a5450058c2 /release | |
| parent | 872412284cc6afc81eef27be4141ef68cc990c80 (diff) | |
Fix: Proportional editing menu disappears after deleting object
Differential Revision: D4460
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 50604e6a986..2fbaa9405ec 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -197,34 +197,26 @@ class VIEW3D_HT_header(Header): ) # Proportional editing - if obj: - gpd = context.gpencil_data - 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) - sub.active = tool_settings.proportional_edit != 'DISABLED' - sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True) - - elif object_mode == 'OBJECT': - row = layout.row(align=True) - row.prop(tool_settings, "use_proportional_edit_objects", icon_only=True) - sub = row.row(align=True) - sub.active = tool_settings.use_proportional_edit_objects - sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True) + gpd = context.gpencil_data + 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) + sub.active = tool_settings.proportional_edit != 'DISABLED' + 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) + elif object_mode == 'OBJECT': + row = layout.row(align=True) + row.prop(tool_settings, "use_proportional_edit_objects", icon_only=True) + sub = row.row(align=True) + sub.active = tool_settings.use_proportional_edit_objects + sub.prop(tool_settings, "proportional_edit_falloff", 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: + 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) |