[Bf-blender-cvs] [c1185f3d0db] blender2.8: Cleanup: pep8, windows line endings
Campbell Barton
noreply at git.blender.org
Tue Jul 31 13:30:44 CEST 2018
Commit: c1185f3d0dbbb51dea17cc2ac759776365927738
Author: Campbell Barton
Date: Tue Jul 31 21:06:08 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBc1185f3d0dbbb51dea17cc2ac759776365927738
Cleanup: pep8, windows line endings
===================================================================
M release/scripts/modules/addon_utils.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_data_shaderfx.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_material_gpencil.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
M release/scripts/startup/bl_ui/properties_physics_rigidbody.py
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/space_clip.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_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_topbar.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/modules/addon_utils.py b/release/scripts/modules/addon_utils.py
index 86185b96e9d..f73d23c150b 100644
--- a/release/scripts/modules/addon_utils.py
+++ b/release/scripts/modules/addon_utils.py
@@ -367,14 +367,14 @@ def enable(module_name, *, default_set=False, persistent=False, handle_error=Non
# Silent default, we know these need updating.
if module_name in {
- "io_anim_bvh",
- "io_mesh_ply",
- "io_mesh_stl",
- "io_mesh_uv_layout",
- "io_scene_3ds",
- "io_scene_fbx",
- "io_scene_obj",
- "io_scene_x3d",
+ "io_anim_bvh",
+ "io_mesh_ply",
+ "io_mesh_stl",
+ "io_mesh_uv_layout",
+ "io_scene_3ds",
+ "io_scene_fbx",
+ "io_scene_obj",
+ "io_scene_x3d",
}:
return None
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 14407afa8f2..d46431afef4 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -21,13 +21,14 @@ import bpy
from bpy.types import Menu, Panel, UIList
from rna_prop_ui import PropertyPanel
from .properties_grease_pencil_common import (
- GreasePencilDataPanel,
- GreasePencilOnionPanel,
- )
+ GreasePencilDataPanel,
+ GreasePencilOnionPanel,
+)
###############################
# Base-Classes (for shared stuff - e.g. poll, attributes, etc.)
+
class DataButtonsPanel:
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@@ -379,6 +380,7 @@ class DATA_PT_custom_props_gpencil(DataButtonsPanel, PropertyPanel, Panel):
###############################
+
classes = (
DATA_PT_gpencil,
DATA_PT_gpencil_datapanel,
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 2328925bbad..7eeb45cc52e 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -28,6 +28,7 @@ class ModifierButtonsPanel:
bl_context = "modifier"
bl_options = {'HIDE_HEADER'}
+
class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
bl_label = "Modifiers"
@@ -1857,7 +1858,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
if md.mode == 'CONCURRENT':
col.prop(md, "concurrent_time_alignment")
else:
- col.separator() # For spacing
+ col.separator() # For spacing
col.separator()
col.separator()
@@ -1929,7 +1930,6 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
layout.label(text="Object:")
layout.prop(md, "object", text="")
-
def GP_HOOK(self, layout, ob, md):
gpd = ob.data
split = layout.split()
@@ -1977,7 +1977,6 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.prop(md, "use_falloff_uniform")
-
def GP_OFFSET(self, layout, ob, md):
gpd = ob.data
split = layout.split()
@@ -1989,7 +1988,6 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
col.prop(md, "rotation")
-
col.label("Layer:")
row = col.row(align=True)
row.prop_search(md, "layer", gpd, "layers", text="", icon='GREASEPENCIL')
diff --git a/release/scripts/startup/bl_ui/properties_data_shaderfx.py b/release/scripts/startup/bl_ui/properties_data_shaderfx.py
index 5010f56d234..3798a273e09 100644
--- a/release/scripts/startup/bl_ui/properties_data_shaderfx.py
+++ b/release/scripts/startup/bl_ui/properties_data_shaderfx.py
@@ -28,6 +28,7 @@ class ShaderFxButtonsPanel:
bl_context = "shaderfx"
bl_options = {'HIDE_HEADER'}
+
class DATA_PT_shader_fx(ShaderFxButtonsPanel, Panel):
bl_label = "Effects"
@@ -79,7 +80,7 @@ class DATA_PT_shader_fx(ShaderFxButtonsPanel, Panel):
if fx.mode in {'BITONE', 'CUSTOM', 'TRANSPARENT'}:
layout.prop(fx, "factor")
- def FX_WAVE(self, layout,fx):
+ def FX_WAVE(self, layout, fx):
layout.prop(fx, "orientation", expand=True)
layout.separator()
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 65e7abe24a4..7426d2d463f 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -128,8 +128,8 @@ class GreasePencilDrawingToolsPanel:
elif is_clip_editor:
row.prop(context.space_data, "grease_pencil_source", expand=True)
- #col.separator()
- #col.separator()
+ # col.separator()
+ # col.separator()
gpencil_stroke_placement_settings(context, col)
@@ -404,7 +404,7 @@ class GPENCIL_MT_pie_settings_palette(Menu):
pie = layout.menu_pie()
gpd = context.gpencil_data
gpl = context.active_gpencil_layer
- palcolor = None #context.active_gpencil_palettecolor
+ palcolor = None # context.active_gpencil_palettecolor
brush = context.active_gpencil_brush
is_editmode = bool(gpd and gpd.use_stroke_edit_mode and context.editable_gpencil_strokes)
@@ -812,7 +812,7 @@ class GreasePencilOnionPanel:
row = layout.row()
row.active = gp.use_onion_skinning
row.prop(gp, "use_onion_fade", text="Fade")
- if hasattr(gp, "use_onion_loop"): # XXX
+ if hasattr(gp, "use_onion_loop"): # XXX
subrow = layout.row()
subrow.active = gp.onion_mode in ('RELATIVE', 'SELECTED')
subrow.prop(gp, "use_onion_loop", text="Loop")
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 2d823594547..d83639a361c 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -84,7 +84,6 @@ class GPMaterialButtonsPanel:
ob.active_material.grease_pencil)
-
class MATERIAL_PT_gpencil_slots(Panel):
bl_label = "Grease Pencil Material Slots"
bl_space_type = 'PROPERTIES'
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 75b2d76d9c4..393c9784be8 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -845,13 +845,13 @@ class PARTICLE_PT_physics_boids_movement(ParticleButtonsPanel, Panel):
part = particle_get_settings(context)
boids = part.boids
- col=layout.column()
+ col = layout.column()
col.prop(boids, "use_flight")
col.prop(boids, "use_land")
col.prop(boids, "use_climb")
- col=layout.column()
+ col = layout.column()
col.active = boids.use_flight
sub = col.column()
@@ -866,7 +866,7 @@ class PARTICLE_PT_physics_boids_movement(ParticleButtonsPanel, Panel):
layout.separator()
- col=layout.column()
+ col = layout.column()
col.active = boids.use_land or boids.use_climb
col.prop(boids, "land_speed_max")
col.prop(boids, "land_jump_speed")
@@ -879,6 +879,7 @@ class PARTICLE_PT_physics_boids_movement(ParticleButtonsPanel, Panel):
layout.prop(part, "collision_group")
+
class PARTICLE_PT_physics_boids_battle(ParticleButtonsPanel, Panel):
bl_label = "Battle"
bl_parent_id = "PARTICLE_PT_physics"
@@ -898,7 +899,7 @@ class PARTICLE_PT_physics_boids_battle(ParticleButtonsPanel, Panel):
part = particle_get_settings(context)
boids = part.boids
- col=layout.column()
+ col = layout.column()
col.prop(boids, "health")
col.prop(boids, "strength")
@@ -906,6 +907,7 @@ class PARTICLE_PT_physics_boids_battle(ParticleButtonsPanel, Panel):
col.prop(boids, "accuracy")
col.prop(boids, "range")
+
class PARTICLE_PT_physics_boids_misc(ParticleButtonsPanel, Panel):
bl_label = "Misc"
bl_parent_id = "PARTICLE_PT_physics"
@@ -925,7 +927,7 @@ class PARTICLE_PT_physics_boids_misc(ParticleButtonsPanel, Panel):
part = particle_get_settings(context)
boids = part.boids
- col=layout.column()
+ col = layout.column()
col.prop(boids, "bank", slider=True)
col.prop(boids, "pitch", slider=True)
@@ -950,7 +952,6 @@ class PARTICLE_PT_physics_relations(ParticleButtonsPanel, Panel):
psys = context.particle_system
part = particle_get_settings(context)
-
row = layout.row()
row.template_list("UI_UL_list", "particle_targets", psys, "targets",
psys, "active_particle_target_index", rows=4)
@@ -993,7 +994,6 @@ class PARTICLE_PT_physics_relations(ParticleButtonsPanel, Panel):
sub.prop(key, "system", text="System")
-
class PARTICLE_PT_physics_deflection(ParticleButtonsPanel, Panel):
bl_label = "Deflection"
bl_parent_id = "PARTICLE_PT_physics"
diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
index 44d07ff53e6..3a475c82f5c 100644
--- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
@@ -97,7 +97,6 @@ class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, Panel):
col.prop(surface, "image_resolution")
col.prop(surface, "use_antialiasing")
-
sub = col.column(align=True)
sub.prop(surface, "frame_start", text="Frame Start")
sub.prop(surface, "frame_end", text="End")
@@ -228,7 +227,6 @@ class PHYSICS_PT_dp_advanced_canvas_paint_dissolve(PhysicButtonsPanel, Panel):
surface = canvas.canvas_surfaces.active
self.layout.prop(surface, "use_dissolve", text="
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list