Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-10-01 04:56:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-01 05:00:08 +0300
commit1f2c4f8809aab37d04ee0c571c33466643e103b6 (patch)
treedd46ee9cc319d2ac6e29b1eedbfa9d0d5a3a9b9e /release/scripts
parent12c49d05c655116529e8c08e7d4f6b40d186393a (diff)
Cleanup: use standard prefix for boolean settings
Avoid using 'add' as a prefix, it reads like a method.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_modifier.py16
-rw-r--r--release/scripts/startup/bl_ui/properties_grease_pencil_common.py16
-rw-r--r--release/scripts/startup/bl_ui/space_topbar.py2
3 files changed, 17 insertions, 17 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 843ab79a639..3e7dce6d34c 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1652,10 +1652,10 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
row = layout.row(align=True)
row.label(text="Affect:")
row = layout.row(align=True)
- row.prop(md, "affect_position", text="Position", icon='MESH_DATA', toggle=True)
- row.prop(md, "affect_strength", text="Strength", icon='COLOR', toggle=True)
- row.prop(md, "affect_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
- row.prop(md, "affect_uv", text="UV", icon='MOD_UVPROJECT', toggle=True)
+ row.prop(md, "use_edit_position", text="Position", icon='MESH_DATA', toggle=True)
+ row.prop(md, "use_edit_strength", text="Strength", icon='COLOR', toggle=True)
+ row.prop(md, "use_edit_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
+ row.prop(md, "use_edit_uv", text="UV", icon='MOD_UVPROJECT', toggle=True)
def GP_SMOOTH(self, layout, ob, md):
gpd = ob.data
@@ -1683,10 +1683,10 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
row = layout.row(align=True)
row.label(text="Affect:")
row = layout.row(align=True)
- row.prop(md, "affect_position", text="Position", icon='MESH_DATA', toggle=True)
- row.prop(md, "affect_strength", text="Strength", icon='COLOR', toggle=True)
- row.prop(md, "affect_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
- row.prop(md, "affect_uv", text="UV", icon='MOD_UVPROJECT', toggle=True)
+ row.prop(md, "use_edit_position", text="Position", icon='MESH_DATA', toggle=True)
+ row.prop(md, "use_edit_strength", text="Strength", icon='COLOR', toggle=True)
+ row.prop(md, "use_edit_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
+ row.prop(md, "use_edit_uv", text="UV", icon='MOD_UVPROJECT', toggle=True)
def GP_SUBDIV(self, layout, ob, md):
gpd = ob.data
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 31038396efb..9d8693e5e38 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -298,14 +298,14 @@ class GreasePencilSculptOptionsPanel:
brush = settings.brush
if tool in {'SMOOTH', 'RANDOMIZE'}:
- layout.prop(settings, "affect_position", text="Affect Position")
- layout.prop(settings, "affect_strength", text="Affect Strength")
- layout.prop(settings, "affect_thickness", text="Affect Thickness")
+ layout.prop(settings, "use_edit_position", text="Affect Position")
+ layout.prop(settings, "use_edit_strength", text="Affect Strength")
+ layout.prop(settings, "use_edit_thickness", text="Affect Thickness")
if tool == 'SMOOTH':
- layout.prop(brush, "affect_pressure")
+ layout.prop(brush, "use_edit_pressure")
- layout.prop(settings, "affect_uv", text="Affect UV")
+ layout.prop(settings, "use_edit_uv", text="Affect UV")
# GP Object Tool Settings
@@ -584,9 +584,9 @@ class GPENCIL_MT_pie_sculpt(Menu):
col.prop(brush, "use_falloff")
if settings.tool in {'SMOOTH', 'RANDOMIZE'}:
row = col.row(align=True)
- row.prop(settings, "affect_position", text="Position", icon='MESH_DATA', toggle=True)
- row.prop(settings, "affect_strength", text="Strength", icon='COLOR', toggle=True)
- row.prop(settings, "affect_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
+ row.prop(settings, "use_edit_position", text="Position", icon='MESH_DATA', toggle=True)
+ row.prop(settings, "use_edit_strength", text="Strength", icon='COLOR', toggle=True)
+ row.prop(settings, "use_edit_thickness", text="Thickness", icon='LINE_DATA', toggle=True)
# S - Change Brush Type Shortcuts
row = pie.row()
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 5c2314d131c..4f1473e419d 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -217,7 +217,7 @@ class TOPBAR_HT_lower_bar(Header):
)
layout.prop(context.tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO')
- layout.prop(context.tool_settings, "add_gpencil_weight_data", text="", icon='WPAINT_HLT')
+ layout.prop(context.tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT')
layout.prop(context.tool_settings, "use_gpencil_additive_drawing", text="", icon='FREEZE')
elif mode in {'GPENCIL_EDIT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
layout.label(text="Layer:")