archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

pep8 edits

Browse Source
This commit is contained in:
Campbell Barton
2011-11-13 14:38:00 +00:00
parent 64ca81ef0f
commit a7c37e5254
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@@ -420,14 +420,14 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
return return
layout.prop(md, "geometry_mode") layout.prop(md, "geometry_mode")
if md.geometry_mode == 'GENERATE': if md.geometry_mode == 'GENERATE':
row = layout.row() row = layout.row()
row.prop(md, "repeat_x") row.prop(md, "repeat_x")
row.prop(md, "repeat_y") row.prop(md, "repeat_y")
layout.separator() layout.separator()
flow = layout.column_flow() flow = layout.column_flow()
flow.prop(md, "time") flow.prop(md, "time")
flow.prop(md, "resolution") flow.prop(md, "resolution")
@@ -435,15 +435,15 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
flow.prop(md, "depth") flow.prop(md, "depth")
layout.label("Waves:") layout.label("Waves:")
split = layout.split() split = layout.split()
col = split.column() col = split.column()
col.prop(md, "choppiness") col.prop(md, "choppiness")
col.prop(md, "wave_scale", text="Scale") col.prop(md, "wave_scale", text="Scale")
col.prop(md, "smallest_wave") col.prop(md, "smallest_wave")
col.prop(md, "wind_velocity") col.prop(md, "wind_velocity")
col = split.column() col = split.column()
col.prop(md, "wave_alignment", text="Alignment") col.prop(md, "wave_alignment", text="Alignment")
sub = col.column() sub = col.column()
@@ -452,33 +452,33 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
sub.prop(md, "damp") sub.prop(md, "damp")
layout.separator() layout.separator()
layout.prop(md, "generate_normals") layout.prop(md, "generate_normals")
row = layout.row() row = layout.row()
row.prop(md, "generate_foam") row.prop(md, "generate_foam")
sub = row.row() sub = row.row()
sub.active = md.generate_foam sub.active = md.generate_foam
sub.prop(md, "foam_coverage", text="Coverage") sub.prop(md, "foam_coverage", text="Coverage")
layout.separator() layout.separator()
if md.is_cached: 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: else:
layout.operator("object.ocean_bake") layout.operator("object.ocean_bake")
split = layout.split() split = layout.split()
split.enabled = not md.is_cached split.enabled = not md.is_cached
col = split.column(align=True) col = split.column(align=True)
col.prop(md, "bake_start", text="Start") col.prop(md, "bake_start", text="Start")
col.prop(md, "bake_end", text="End") col.prop(md, "bake_end", text="End")
col = split.column(align=True) col = split.column(align=True)
col.label(text="Cache path:") col.label(text="Cache path:")
col.prop(md, "filepath", text="") col.prop(md, "filepath", text="")
#col.prop(md, "bake_foam_fade") #col.prop(md, "bake_foam_fade")
def PARTICLE_INSTANCE(self, layout, ob, md): def PARTICLE_INSTANCE(self, layout, ob, md):

8
release/scripts/startup/bl_ui/properties_texture.py
View File

@@ -778,14 +778,14 @@ class TEXTURE_PT_ocean(TextureTypePanel, Panel):
bl_label = "Ocean" bl_label = "Ocean"
tex_type = 'OCEAN' tex_type = 'OCEAN'
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
tex = context.texture tex = context.texture
ot = tex.ocean ot = tex.ocean
col = layout.column() col = layout.column()
col.prop(ot, "ocean_object") col.prop(ot, "ocean_object")
col.prop(ot, "output") col.prop(ot, "output")