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>2011-11-13 18:38:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-13 18:38:00 +0400
commita7c37e525481d17d06e3a9993b1c765c7385d2cb (patch)
treeecdbbb62678d6c2409f6d313efa9be333af1d91d
parent64ca81ef0f34552c07301871c0de18933e3da8c1 (diff)
pep8 edits
-rw-r--r--release/scripts/startup/bl_ui/properties_data_modifier.py26
-rw-r--r--release/scripts/startup/bl_ui/properties_texture.py8
2 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 f1b6f0baeb1..17faf5b6627 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -420,14 +420,14 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
return
layout.prop(md, "geometry_mode")
-
+
if md.geometry_mode == 'GENERATE':
row = layout.row()
row.prop(md, "repeat_x")
row.prop(md, "repeat_y")
layout.separator()
-
+
flow = layout.column_flow()
flow.prop(md, "time")
flow.prop(md, "resolution")
@@ -435,15 +435,15 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
flow.prop(md, "depth")
layout.label("Waves:")
-
+
split = layout.split()
-
+
col = split.column()
col.prop(md, "choppiness")
col.prop(md, "wave_scale", text="Scale")
col.prop(md, "smallest_wave")
col.prop(md, "wind_velocity")
-
+
col = split.column()
col.prop(md, "wave_alignment", text="Alignment")
sub = col.column()
@@ -452,33 +452,33 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
sub.prop(md, "damp")
layout.separator()
-
+
layout.prop(md, "generate_normals")
-
+
row = layout.row()
row.prop(md, "generate_foam")
sub = row.row()
sub.active = md.generate_foam
sub.prop(md, "foam_coverage", text="Coverage")
-
+
layout.separator()
if md.is_cached:
- layout.operator("object.ocean_bake", text="Free Bake").free=True
+ layout.operator("object.ocean_bake", text="Free Bake").free = True
else:
layout.operator("object.ocean_bake")
-
+
split = layout.split()
split.enabled = not md.is_cached
-
+
col = split.column(align=True)
col.prop(md, "bake_start", text="Start")
col.prop(md, "bake_end", text="End")
-
+
col = split.column(align=True)
col.label(text="Cache path:")
col.prop(md, "filepath", text="")
-
+
#col.prop(md, "bake_foam_fade")
def PARTICLE_INSTANCE(self, layout, ob, md):
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index 70c231b11bf..6b4cfa8fb95 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -778,14 +778,14 @@ class TEXTURE_PT_ocean(TextureTypePanel, Panel):
bl_label = "Ocean"
tex_type = 'OCEAN'
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
+
def draw(self, context):
layout = self.layout
-
+
tex = context.texture
ot = tex.ocean
-
- col = layout.column()
+
+ col = layout.column()
col.prop(ot, "ocean_object")
col.prop(ot, "output")