[Bf-blender-cvs] [42b9df5907d] master: Cleanup: use 'tool_settings' name everywhere in UI scripts
Campbell Barton
noreply at git.blender.org
Mon Dec 17 07:26:14 CET 2018
Commit: 42b9df5907d041a5a68585308b1e11b2eac2c947
Author: Campbell Barton
Date: Mon Dec 17 17:20:24 2018 +1100
Branches: master
https://developer.blender.org/rB42b9df5907d041a5a68585308b1e11b2eac2c947
Cleanup: use 'tool_settings' name everywhere in UI scripts
===================================================================
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_dopesheet.py
M release/scripts/startup/bl_ui/space_graph.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_time.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 0f3052f64c2..cc40ca2cb66 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -171,10 +171,10 @@ class BRUSH_OT_active_index_set(Operator):
if attr is None:
return {'CANCELLED'}
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
for i, brush in enumerate((cur for cur in bpy.data.brushes if getattr(cur, attr))):
if i == self.index:
- getattr(toolsettings, self.mode).brush = brush
+ getattr(tool_settings, self.mode).brush = brush
return {'FINISHED'}
return {'CANCELLED'}
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 373e3797f71..099de6e5e42 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -33,30 +33,30 @@ def gpencil_stroke_placement_settings(context, layout):
else:
propname = "gpencil_stroke_placement_view2d"
- ts = context.tool_settings
+ tool_settings = context.tool_settings
col = layout.column(align=True)
col.label(text="Stroke Placement:")
row = col.row(align=True)
- row.prop_enum(ts, propname, 'VIEW')
- row.prop_enum(ts, propname, 'CURSOR')
+ row.prop_enum(tool_settings, propname, 'VIEW')
+ row.prop_enum(tool_settings, propname, 'CURSOR')
if context.space_data.type == 'VIEW_3D':
row = col.row(align=True)
- row.prop_enum(ts, propname, 'SURFACE')
- row.prop_enum(ts, propname, 'STROKE')
+ row.prop_enum(tool_settings, propname, 'SURFACE')
+ row.prop_enum(tool_settings, propname, 'STROKE')
row = col.row(align=False)
- row.active = getattr(ts, propname) in {'SURFACE', 'STROKE'}
- row.prop(ts, "use_gpencil_stroke_endpoints")
+ row.active = getattr(tool_settings, propname) in {'SURFACE', 'STROKE'}
+ row.prop(tool_settings, "use_gpencil_stroke_endpoints")
if context.scene.tool_settings.gpencil_stroke_placement_view3d == 'CURSOR':
row = col.row(align=True)
row.label("Lock axis:")
row = col.row(align=True)
- row.prop(ts.gpencil_sculpt, "lockaxis", expand=True)
+ row.prop(tool_settings.gpencil_sculpt, "lockaxis", expand=True)
def gpencil_active_brush_settings_simple(context, layout):
@@ -313,12 +313,20 @@ class GreasePencilBrushPanel:
row = layout.row()
col = row.column()
- ts = context.scene.tool_settings
- if len(ts.gpencil_brushes) >= 2:
+ tool_settings = context.scene.tool_settings
+ if len(tool_settings.gpencil_brushes) >= 2:
brows = 3
else:
brows = 2
- col.template_list("GPENCIL_UL_brush", "", ts, "gpencil_brushes", ts.gpencil_brushes, "active_index", rows=brows)
+ col.template_list(
+ "GPENCIL_UL_brush",
+ "",
+ tool_settings,
+ "gpencil_brushes",
+ tool_settings.gpencil_brushes,
+ "active_index",
+ rows=brows,
+ )
col = row.column()
@@ -328,7 +336,7 @@ class GreasePencilBrushPanel:
sub.menu("GPENCIL_MT_brush_specials", icon='DOWNARROW_HLT', text="")
brush = context.active_gpencil_brush
if brush:
- if len(ts.gpencil_brushes) > 1:
+ if len(tool_settings.gpencil_brushes) > 1:
col.separator()
sub = col.column(align=True)
sub.operator("gpencil.brush_move", icon='TRIA_UP', text="").type = 'UP'
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index b4049bf7b68..bda926f63db 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -27,21 +27,21 @@ class UnifiedPaintPanel:
@staticmethod
def paint_settings(context):
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
if context.sculpt_object:
- return toolsettings.sculpt
+ return tool_settings.sculpt
elif context.vertex_paint_object:
- return toolsettings.vertex_paint
+ return tool_settings.vertex_paint
elif context.weight_paint_object:
- return toolsettings.weight_paint
+ return tool_settings.weight_paint
elif context.image_paint_object:
- if (toolsettings.image_paint and toolsettings.image_paint.detect_data()):
- return toolsettings.image_paint
+ if (tool_settings.image_paint and tool_settings.image_paint.detect_data()):
+ return tool_settings.image_paint
return None
elif context.particle_edit_object:
- return toolsettings.particle_edit
+ return tool_settings.particle_edit
return None
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index acc91edc410..d4a3f924238 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -119,7 +119,7 @@ class CLIP_HT_header(Header):
def _draw_masking(self, context):
layout = self.layout
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
sc = context.space_data
clip = sc.clip
@@ -140,10 +140,10 @@ class CLIP_HT_header(Header):
layout.prop(sc, "pivot_point", text="", icon_only=True)
row = layout.row(align=True)
- row.prop(toolsettings, "use_proportional_edit_mask",
+ row.prop(tool_settings, "use_proportional_edit_mask",
text="", icon_only=True)
- if toolsettings.use_proportional_edit_mask:
- row.prop(toolsettings, "proportional_edit_falloff",
+ if tool_settings.use_proportional_edit_mask:
+ row.prop(tool_settings, "proportional_edit_falloff",
text="", icon_only=True)
def draw(self, context):
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 731032bafa8..4683b108e37 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -114,7 +114,7 @@ class DOPESHEET_HT_header(Header):
layout = self.layout
st = context.space_data
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
row = layout.row(align=True)
row.template_header()
@@ -158,10 +158,10 @@ class DOPESHEET_HT_header(Header):
row.prop(st.dopesheet, "use_multi_word_filter", text="")
row = layout.row(align=True)
- row.prop(toolsettings, "use_proportional_action",
+ row.prop(tool_settings, "use_proportional_action",
text="", icon_only=True)
- if toolsettings.use_proportional_action:
- row.prop(toolsettings, "proportional_edit_falloff",
+ if tool_settings.use_proportional_action:
+ row.prop(tool_settings, "proportional_edit_falloff",
text="", icon_only=True)
# Grease Pencil mode doesn't need snapping, as it's frame-aligned only
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index 5ed58a57e47..7a920435b18 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -29,7 +29,7 @@ class GRAPH_HT_header(Header):
from .space_dopesheet import dopesheet_filter
layout = self.layout
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
st = context.space_data
@@ -50,10 +50,10 @@ class GRAPH_HT_header(Header):
row = layout.row(align=True)
- row.prop(toolsettings, "use_proportional_fcurve",
+ row.prop(tool_settings, "use_proportional_fcurve",
text="", icon_only=True)
- if toolsettings.use_proportional_fcurve:
- row.prop(toolsettings, "proportional_edit_falloff",
+ if tool_settings.use_proportional_fcurve:
+ row.prop(tool_settings, "proportional_edit_falloff",
text="", icon_only=True)
layout.prop(st, "auto_snap", text="")
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 9a2215969cf..eb903f25f79 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -50,8 +50,8 @@ class BrushButtonsPanel(UnifiedPaintPanel):
@classmethod
def poll(cls, context):
sima = context.space_data
- toolsettings = context.tool_settings.image_paint
- return sima.show_paint and toolsettings.brush
+ tool_settings = context.tool_settings.image_paint
+ return sima.show_paint and tool_settings.brush
class UVToolsPanel:
@@ -73,8 +73,8 @@ class IMAGE_MT_view(Menu):
sima = context.space_data
uv = sima.uv_editor
- toolsettings = context.tool_settings
- paint = toolsettings.image_paint
+ tool_settings = context.tool_settings
+ paint = tool_settings.image_paint
show_uvedit = sima.show_uvedit
show_render = sima.show_render
@@ -86,13 +86,13 @@ class IMAGE_MT_view(Menu):
layout.prop(sima, "use_realtime_update")
if show_uvedit:
- layout.prop(toolsettings, "show_uv_local_view")
+ layout.prop(tool_settings, "show_uv_local_view")
layout.prop(uv, "show_other_objects")
layout.prop(uv, "show_metadata")
if paint.brush and (context.image_paint_object or sima.mode == 'PAINT'):
layout.prop(uv, "s
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list