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>2014-04-03 02:24:09 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-04-03 02:24:09 +0400
commitf38331adefde74c5748a6823ba7f00304d12c8dc (patch)
treea31964f81c668f864d350b2d63c80a8d4361f4fd /release
parent03bd418d1610da28258d361180f6eae2d8be671c (diff)
Code cleanup: style
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_operators/object_quick_effects.py2
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py2
-rw-r--r--release/scripts/startup/bl_ui/space_info.py2
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py1
-rw-r--r--release/scripts/startup/bl_ui/space_view3d_toolbar.py4
5 files changed, 5 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py
index 765135d6f3d..556d34bb0ac 100644
--- a/release/scripts/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@@ -436,7 +436,7 @@ class QuickFluid(Operator):
def execute(self, context):
fake_context = context.copy()
mesh_objects = [obj for obj in context.selected_objects
- if (obj.type == 'MESH' and not 0.0 in obj.dimensions)]
+ if (obj.type == 'MESH' and 0.0 not in obj.dimensions)]
min_co = Vector((100000.0, 100000.0, 100000.0))
max_co = -min_co
diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
index 624d9b9fc24..6a6d8dcff4a 100644
--- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
@@ -236,7 +236,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
# vertex format outputs
if surface.surface_format == 'VERTEX':
if surface_type == 'PAINT':
- # toggle active preview
+ # toggle active preview
layout.prop(surface, "preview_id")
# paint-map output
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index d02d1cb428f..31881671fda 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -245,7 +245,7 @@ class INFO_MT_opengl_render(Menu):
def draw(self, context):
layout = self.layout
-
+
rd = context.scene.render
layout.prop(rd, "use_antialiasing")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 72b63ba0664..d43e6d1f697 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -903,7 +903,6 @@ class INFO_MT_curve_add(Menu):
VIEW3D_PT_tools_add_object.draw_add_curve(layout)
-
class INFO_MT_surface_add(Menu):
bl_idname = "INFO_MT_surface_add"
bl_label = "Surface"
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index b6bd902fd8f..4e9dc1163e2 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1266,7 +1266,7 @@ class VIEW3D_PT_sculpt_dyntopo(Panel, View3DPaintPanel):
col.prop(sculpt, "use_smooth_shading")
col.operator("sculpt.optimize")
if (sculpt.detail_type_method == 'CONSTANT'):
- col.operator("sculpt.detail_flood_fill")
+ col.operator("sculpt.detail_flood_fill")
col.separator()
col.prop(sculpt, "symmetrize_direction")
col.operator("sculpt.symmetrize")
@@ -1295,7 +1295,7 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
col.prop(sculpt, "gravity", slider=True, text="Factor")
col.prop(sculpt, "gravity_object")
col.separator()
-
+
col = layout.column(align=True)
col.label(text="Threads:")
col.row(align=True).prop(scene, "omp_threads_mode", expand=True)