[Bf-blender-cvs] [e71d489254c] blender2.8: Cleanup: style
Campbell Barton
noreply at git.blender.org
Thu Dec 20 03:12:02 CET 2018
Commit: e71d489254c9d9639902e3ae8d2393a902eb11c8
Author: Campbell Barton
Date: Thu Dec 20 13:01:40 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBe71d489254c9d9639902e3ae8d2393a902eb11c8
Cleanup: style
===================================================================
M release/scripts/startup/bl_operators/view3d.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M release/scripts/startup/bl_ui/properties_data_modifier.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/properties_render.py
M release/scripts/startup/bl_ui/space_dopesheet.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_toolsystem_common.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_userpref.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/view3d.py b/release/scripts/startup/bl_operators/view3d.py
index 58ddc50c808..9e27edaa3be 100644
--- a/release/scripts/startup/bl_operators/view3d.py
+++ b/release/scripts/startup/bl_operators/view3d.py
@@ -187,7 +187,7 @@ class VIEW3D_OT_select_or_deselect_all(Operator):
def invoke(self, context, event):
retval = bpy.ops.view3d.select(
'INVOKE_DEFAULT',
- True, # undo push
+ True, # undo push
extend=self.extend,
deselect=self.deselect,
toggle=self.toggle,
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index bf968de8641..4461812cc2e 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1124,7 +1124,6 @@ class WM_OT_properties_edit(Operator):
return value_eval
-
def get_default_eval(self):
try:
default_eval = eval(self.default)
@@ -1135,7 +1134,6 @@ class WM_OT_properties_edit(Operator):
return default_eval
-
def execute(self, context):
from rna_prop_ui import (
rna_idprop_ui_prop_get,
@@ -1252,7 +1250,7 @@ class WM_OT_properties_edit(Operator):
# default default value
prop_type = type(self.get_value_eval())
- if prop_type in {int,float}:
+ if prop_type in {int, float}:
self.default = str(prop_type(0))
else:
self.default = ""
@@ -1315,7 +1313,7 @@ class WM_OT_properties_edit(Operator):
layout.prop(self, "value")
row = layout.row()
- row.enabled = type(self.get_value_eval()) in {int,float}
+ row.enabled = type(self.get_value_eval()) in {int, float}
row.prop(self, "default")
row = layout.row(align=True)
@@ -2396,6 +2394,7 @@ class WM_OT_toolbar(Operator):
if use_toolbar_release_hack:
_key_held = None
+
def invoke(self, context, event):
WM_OT_toolbar._key_held = event.type
return self.execute(context)
@@ -2520,7 +2519,7 @@ class WM_OT_studiolight_new(Operator):
except:
traceback.print_exc()
- finalpath = str(path_studiolights.joinpath(self.filename));
+ finalpath = str(path_studiolights.joinpath(self.filename))
if pathlib.Path(finalpath + ".sl").is_file():
if not self.ask_overide:
self.ask_overide = True
@@ -2678,7 +2677,7 @@ class WM_MT_splash(Menu):
#sub = col.split(factor=0.35)
#row = sub.row()
#row.alignment = 'RIGHT'
- #row.label(text="Language:")
+ # row.label(text="Language:")
#userpref = context.user_preferences
#sub.prop(userpref.system, "language", text="")
@@ -2808,6 +2807,7 @@ class WM_OT_drop_blend_file(Operator):
col.operator("wm.link", text="Link...", icon='LINK_BLEND').filepath = self.filepath
col.operator("wm.append", text="Append...", icon='APPEND_BLEND').filepath = self.filepath
+
classes = (
WM_OT_addon_disable,
WM_OT_addon_enable,
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 56612c3aa1b..f1205b05f3d 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -143,7 +143,7 @@ class DATA_PT_gpencil_datapanel(Panel):
srow = col.row(align=True)
srow.prop(gpl, "opacity", text="Opacity", slider=True)
srow.prop(gpl, "clamp_layer", text="",
- icon='MOD_MASK' if gpl.clamp_layer else 'LAYER_ACTIVE')
+ icon='MOD_MASK' if gpl.clamp_layer else 'LAYER_ACTIVE')
col = row.column()
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 7641851b183..3d4f3037a84 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -615,7 +615,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
layout.separator()
col = layout.column()
-
flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
col.label(text="Textures:")
@@ -635,7 +634,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col.prop(md, "offset_u")
col.prop(md, "offset_v")
-
def MULTIRES(self, layout, ob, md):
layout.row().prop(md, "subdivision_type", expand=True)
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 9ba2c0645d1..11aeb741352 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -983,8 +983,8 @@ class GPENCIL_UL_layer(UIList):
row = layout.row(align=True)
row.prop(gpl, "clamp_layer", text="",
- icon='MOD_MASK' if gpl.clamp_layer else 'LAYER_ACTIVE',
- emboss=False)
+ icon='MOD_MASK' if gpl.clamp_layer else 'LAYER_ACTIVE',
+ emboss=False)
row.prop(gpl, "lock", text="", emboss=False)
row.prop(gpl, "hide", text="", emboss=False)
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 76eee827553..72f48457faa 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -311,6 +311,7 @@ def brush_mask_texture_settings(layout, brush):
col.prop(mask_tex_slot, "offset")
col.prop(mask_tex_slot, "scale")
+
classes = (
VIEW3D_MT_tools_projectpaint_clone,
)
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 9f24945573b..a45c2bc0d27 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -148,6 +148,7 @@ class RENDER_PT_eevee_ambient_occlusion(RenderButtonsPanel, Panel):
col.prop(props, "use_gtao_bent_normals")
col.prop(props, "use_gtao_bounce")
+
class RENDER_PT_eevee_motion_blur(RenderButtonsPanel, Panel):
bl_label = "Motion Blur"
bl_options = {'DEFAULT_CLOSED'}
@@ -505,7 +506,6 @@ class RENDER_PT_eevee_film(RenderButtonsPanel, Panel):
col.prop(rd, "alpha_mode", text="Alpha")
-
class RENDER_PT_eevee_hair(RenderButtonsPanel, Panel):
bl_label = "Hair"
bl_options = {'DEFAULT_CLOSED'}
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 47c5de861ca..f0f8cf1028d 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -423,6 +423,7 @@ class DOPESHEET_MT_marker(Menu):
#######################################
# Keyframe Editing
+
class DOPESHEET_MT_channel(Menu):
bl_label = "Channel"
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 6b407daaccb..73afb62567c 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -145,7 +145,6 @@ class NODE_HT_header(Header):
layout.template_ID(snode, "node_tree", new="node.new_node_tree")
-
layout.prop(snode, "pin", text="")
layout.separator_spacer()
@@ -576,9 +575,11 @@ class EEVEE_NODE_PT_material_settings(Panel):
@classmethod
def poll(cls, context):
snode = context.space_data
- return (context.engine in cls.COMPAT_ENGINES) and \
- snode.tree_type == 'ShaderNodeTree' and snode.id and \
- snode.id.bl_rna.identifier == 'Material'
+ return (
+ (context.engine in cls.COMPAT_ENGINES) and
+ (snode.tree_type == 'ShaderNodeTree' and snode.id) and
+ (snode.id.bl_rna.identifier == 'Material')
+ )
def draw(self, context):
material = context.space_data.id
@@ -595,8 +596,10 @@ class NODE_PT_material_viewport(Panel):
@classmethod
def poll(cls, context):
snode = context.space_data
- return snode.tree_type == 'ShaderNodeTree' and snode.id and \
- snode.id.bl_rna.identifier == 'Material'
+ return (
+ (snode.tree_type == 'ShaderNodeTree' and snode.id) and
+ (snode.id.bl_rna.identifier == "Material")
+ )
def draw(self, context):
material = context.space_data.id
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index a018a64e91c..b6c42d9208d 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -99,7 +99,7 @@ class SEQUENCER_HT_header(Header):
if st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'}:
layout.separator()
- layout.operator("sequencer.refresh_all", icon="FILE_REFRESH", text="")
+ layout.operator("sequencer.refresh_all", icon='FILE_REFRESH', text="")
if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}:
layout.prop(st, "display_mode", text="", icon_only=True)
@@ -408,7 +408,7 @@ class SEQUENCER_MT_add_effect(Menu):
col.operator("sequencer.effect_strip_add", text="Alpha Over").type = 'ALPHA_OVER'
col.operator("sequencer.effect_strip_add", text="Alpha Under").type = 'ALPHA_UNDER'
col.operator("sequencer.effect_strip_add", text="Color Mix").type = 'COLORMIX'
- col.enabled = sel_sequences(context) >=2
+ col.enabled = sel_sequences(context) >= 2
layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index d8a8c2a268e..9d13bd93c86 100644
--- a/release/s
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list