[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41748] trunk/blender: pep/ style edits & quiet some warnings
Campbell Barton
ideasman42 at gmail.com
Fri Nov 11 04:28:54 CET 2011
Revision: 41748
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41748
Author: campbellbarton
Date: 2011-11-11 03:28:46 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
pep/style edits & quiet some warnings
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_material.py
trunk/blender/release/scripts/startup/bl_ui/properties_object.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_softbody.py
trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
trunk/blender/release/scripts/startup/bl_ui/space_graph.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_nla.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_time.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/editors/object/object_constraint.c
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -233,10 +233,13 @@
bl_label = "Follow Active Quads"
bl_options = {'REGISTER', 'UNDO'}
- mode = bpy.props.EnumProperty(items=(("EVEN", "Even", "Space all UVs evently"), ("LENGTH", "Length", "Average space UVs edge length of each loop")),
- name="Edge Length Mode",
- description="Method to space UV edge loops",
- default="LENGTH")
+ mode = bpy.props.EnumProperty(
+ name="Edge Length Mode",
+ description="Method to space UV edge loops",
+ items=(('EVEN', "Even", "Space all UVs evently"),
+ ('LENGTH', "Length", "Average space UVs edge length of each loop")),
+ default='LENGTH',
+ )
@classmethod
def poll(cls, context):
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -552,9 +552,9 @@
PREF_CONTEXT = bpy.props.EnumProperty(
name="Selection",
- items=(("SEL_FACES", "Selected Faces", "Space all UVs evently"),
- ("ALL_FACES", "All Faces", "Average space UVs edge length of each loop"),
- ("ALL_OBJECTS", "Selected Mesh Object", "Average space UVs edge length of each loop")
+ items=(('SEL_FACES', "Selected Faces", "Space all UVs evently"),
+ ('ALL_FACES', "All Faces", "Average space UVs edge length of each loop"),
+ ('ALL_OBJECTS', "Selected Mesh Object", "Average space UVs edge length of each loop")
),
)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -71,7 +71,7 @@
flow.prop(arm, "use_deform_envelopes", text="Envelopes")
flow.prop(arm, "use_deform_preserve_volume", text="Quaternion")
- if context.scene.render.engine == "BLENDER_GAME":
+ if context.scene.render.engine == 'BLENDER_GAME':
layout.row().prop(arm, "deform_method", expand=True)
@@ -289,7 +289,7 @@
row.prop(itasc, "damping_max", text="Damp", slider=True)
row.prop(itasc, "damping_epsilon", text="Eps", slider=True)
-from bl_ui.properties_animviz import (
+from .properties_animviz import (
MotionPathButtonsPanel,
OnionSkinButtonsPanel,
)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -18,7 +18,7 @@
# <pep8 compliant>
import bpy
-from bpy.types import Panel
+from bpy.types import Panel, Menu
from rna_prop_ui import PropertyPanel
@@ -33,12 +33,12 @@
return context.camera and (engine in cls.COMPAT_ENGINES)
-class CAMERA_MT_presets(bpy.types.Menu):
+class CAMERA_MT_presets(Menu):
bl_label = "Camera Presets"
preset_subdir = "camera"
preset_operator = "script.execute_preset"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
- draw = bpy.types.Menu.draw_preset
+ draw = Menu.draw_preset
class DATA_PT_context_camera(CameraButtonsPanel, Panel):
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -18,6 +18,7 @@
# <pep8 compliant>
import bpy
+from bpy.types import Panel
from rna_prop_ui import PropertyPanel
@@ -32,7 +33,7 @@
return context.speaker and (engine in cls.COMPAT_ENGINES)
-class DATA_PT_context_speaker(DataButtonsPanel, bpy.types.Panel):
+class DATA_PT_context_speaker(DataButtonsPanel, Panel):
bl_label = ""
bl_options = {'HIDE_HEADER'}
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -52,7 +53,7 @@
split.template_ID(space, "pin_id")
-class DATA_PT_speaker(DataButtonsPanel, bpy.types.Panel):
+class DATA_PT_speaker(DataButtonsPanel, Panel):
bl_label = "Sound"
COMPAT_ENGINES = {'BLENDER_RENDER'}
@@ -71,7 +72,7 @@
row.prop(speaker, "pitch")
-class DATA_PT_distance(DataButtonsPanel, bpy.types.Panel):
+class DATA_PT_distance(DataButtonsPanel, Panel):
bl_label = "Distance"
COMPAT_ENGINES = {'BLENDER_RENDER'}
@@ -94,7 +95,7 @@
col.prop(speaker, "distance_reference", text="Reference")
-class DATA_PT_cone(DataButtonsPanel, bpy.types.Panel):
+class DATA_PT_cone(DataButtonsPanel, Panel):
bl_label = "Cone"
COMPAT_ENGINES = {'BLENDER_RENDER'}
@@ -116,7 +117,7 @@
col.prop(speaker, "cone_volume_outer", text="Outer")
-class DATA_PT_custom_props_speaker(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
+class DATA_PT_custom_props_speaker(DataButtonsPanel, PropertyPanel, Panel):
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
_context_path = "object.data"
_property_type = bpy.types.Speaker
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_game.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_game.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -406,7 +406,7 @@
bl_context = "scene"
-class SCENE_PT_game_navmesh(SceneButtonsPanel, bpy.types.Panel):
+class SCENE_PT_game_navmesh(SceneButtonsPanel, Panel):
bl_label = "Navigation mesh"
bl_default_closed = True
COMPAT_ENGINES = {'BLENDER_GAME'}
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_material.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_material.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -612,7 +612,7 @@
col.prop(halo, "flare_subflare_size", text="Subsize")
-class MATERIAL_PT_game_settings(MaterialButtonsPanel, bpy.types.Panel):
+class MATERIAL_PT_game_settings(MaterialButtonsPanel, Panel):
bl_label = "Game Settings"
COMPAT_ENGINES = {'BLENDER_GAME'}
@@ -637,7 +637,7 @@
row.prop(game, "face_orientation", text="")
-class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel):
+class MATERIAL_PT_physics(MaterialButtonsPanel, Panel):
bl_label = "Physics"
COMPAT_ENGINES = {'BLENDER_GAME'}
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -280,7 +280,7 @@
row.prop(ob, "slow_parent_offset", text="Offset")
-from bl_ui.properties_animviz import (
+from .properties_animviz import (
MotionPathButtonsPanel,
OnionSkinButtonsPanel,
)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -131,7 +131,7 @@
self.space_template(layout, con)
def IK(self, context, layout, con):
- if context.object.pose.ik_solver == "ITASC":
+ if context.object.pose.ik_solver == 'ITASC':
layout.prop(con, "ik_type")
getattr(self, 'IK_' + con.ik_type)(context, layout, con)
else:
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_particle.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_particle.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -21,7 +21,7 @@
from bpy.types import Panel
from rna_prop_ui import PropertyPanel
-from bl_ui.properties_physics_common import (
+from .properties_physics_common import (
point_cache_ui,
effector_weights_ui,
basic_force_field_settings_ui,
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py 2011-11-11 00:44:48 UTC (rev 41747)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py 2011-11-11 03:28:46 UTC (rev 41748)
@@ -20,7 +20,7 @@
import bpy
from bpy.types import Menu, Panel
-from bl_ui.properties_physics_common import (
+from .properties_physics_common import (
point_cache_ui,
effector_weights_ui,
)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list