Commit: 5d4073e248dc9e25003727705e7266699f26e017
Author: Antonioya
Date: Sun Dec 2 00:05:01 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB5d4073e248dc9e25003727705e7266699f26e017
Fix T58460: Proportional edit icon disappears
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
===================================================================
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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
