[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38286] trunk/blender/release/scripts: fix for various python bugs and remove unused var.
Campbell Barton
ideasman42 at gmail.com
Sun Jul 10 19:26:15 CEST 2011
Revision: 38286
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38286
Author: campbellbarton
Date: 2011-07-10 17:26:15 +0000 (Sun, 10 Jul 2011)
Log Message:
-----------
fix for various python bugs and remove unused var.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
trunk/blender/release/scripts/modules/bpy_extras/io_utils.py
trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
trunk/blender/release/scripts/startup/bl_ui/properties_object.py
trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/release/scripts/startup/keyingsets_builtins.py
Modified: trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/image_utils.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/modules/bpy_extras/image_utils.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -99,7 +99,7 @@
return _image_load(nfilepath)
if place_holder:
- image = bpy.data.images.new(os.path.basename(filepath), 128, 128)
+ image = bpy.data.images.new(os.path.basename(imagepath), 128, 128)
# allow the path to be resolved later
image.filepath = imagepath
return image
Modified: trunk/blender/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/io_utils.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/modules/bpy_extras/io_utils.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -262,7 +262,7 @@
filepath_abs = filepath_cpy
mode = 'RELATIVE'
else:
- Excaption("invalid mode given %r" % mode)
+ raise Exception("invalid mode given %r" % mode)
if mode == 'ABSOLUTE':
return filepath_abs
Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -212,8 +212,6 @@
if not hasattr(edges, "pop"):
edges = edges[:]
- edge_dict = {ed.key: ed for ed in mesh.edges if ed.select}
-
while edges:
current_edge = edges.pop()
vert_end, vert_start = current_edge.vertices[:]
@@ -300,7 +298,7 @@
if verts[i][1] == verts[i - 1][0]:
verts.pop(i - 1)
- fill = fill_polygon([verts])
+ fill = tesselate_polygon([verts])
else:
'''
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -94,4 +94,5 @@
col.prop(arm, "show_only_ghost_selected", text="Selected Only")
if __name__ == "__main__": # only for live edit.
+ import bpy
bpy.utils.register_module(__name__)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -299,10 +299,7 @@
return (context.object) and (context.armature)
def draw(self, context):
- layout = self.layout
-
ob = context.object
-
self.draw_settings(context, ob.pose.animation_visualisation, bones=True)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -122,7 +122,6 @@
def draw(self, context):
layout = self.layout
- ob = context.object
curve = context.curve
row = layout.row()
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -34,7 +34,6 @@
def draw(self, context):
layout = self.layout
space = context.space_data
- ob = context.object
if space.use_pin_id:
layout.template_ID(space, "pin_id")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_texture.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_texture.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -208,7 +208,7 @@
return False
engine = context.scene.render.engine
- return TextureButtonsPanel.poll(self, context) and (engine in cls.COMPAT_ENGINES)
+ return TextureButtonsPanel.poll(cls, context) and (engine in cls.COMPAT_ENGINES)
# Texture Type Panels #
Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -434,7 +434,6 @@
@classmethod
def poll(cls, context):
- rd = context.scene.render
sima = context.space_data
# display even when not in game mode because these settings effect the 3d view
return (sima and sima.image) # and (rd.engine == 'BLENDER_GAME')
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -126,7 +126,7 @@
preset_operator = "wm.appconfig_activate"
def draw(self, context):
- props = self.layout.operator("wm.appconfig_default", text="Blender (default)")
+ self.layout.operator("wm.appconfig_default", text="Blender (default)")
# now draw the presets
bpy.types.Menu.draw_preset(self, context)
@@ -1124,7 +1124,6 @@
del pyfile_dir
# done checking for exceptional case
- addon_files_old = set(os.listdir(path_addons))
addons_old = {mod.__name__ for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)}
#check to see if the file is in compressed format (.zip)
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -189,9 +189,9 @@
if km.is_modal:
row.label(text="", icon='LINKED')
if km.is_user_defined:
- op = row.operator("wm.keymap_restore", text="Restore")
+ row.operator("wm.keymap_restore", text="Restore")
else:
- op = row.operator("wm.keymap_edit", text="Edit")
+ row.operator("wm.keymap_edit", text="Edit")
if km.show_expanded_children:
if children:
@@ -213,7 +213,7 @@
col = self.indented_layout(col, level + 1)
subcol = col.split(percentage=0.2).column()
subcol.enabled = km.is_user_defined
- op = subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
+ subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
col.separator()
@@ -351,9 +351,9 @@
row.label()
if km.is_user_defined:
- op = row.operator("wm.keymap_restore", text="Restore")
+ row.operator("wm.keymap_restore", text="Restore")
else:
- op = row.operator("wm.keymap_edit", text="Edit")
+ row.operator("wm.keymap_edit", text="Edit")
for kmi in filtered_items:
self.draw_kmi(display_keymaps, kc, km, kmi, col, 1)
@@ -362,7 +362,7 @@
col = self.indented_layout(layout, 1)
subcol = col.split(percentage=0.2).column()
subcol.enabled = km.is_user_defined
- op = subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
+ subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
def draw_hierarchy(self, display_keymaps, layout):
for entry in KM_HIERARCHY:
@@ -723,9 +723,7 @@
bl_label = "Add Key Map Item"
def execute(self, context):
- wm = context.window_manager
km = context.keymap
- kc = wm.keyconfigs.default
if km.is_modal:
km.keymap_items.new_modal("", 'A', 'PRESS') # kmi
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-07-10 17:04:56 UTC (rev 38285)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-07-10 17:26:15 UTC (rev 38286)
@@ -60,7 +60,6 @@
# ********** default tools for objectmode ****************
-
class VIEW3D_PT_tools_objectmode(View3DPanel, bpy.types.Panel):
bl_context = "objectmode"
bl_label = "Object Tools"
@@ -944,7 +943,6 @@
tool_settings = context.tool_settings
sculpt = tool_settings.sculpt
- settings = __class__.paint_settings(context)
layout.label(text="Lock:")
row = layout.row(align=True)
@@ -974,7 +972,6 @@
layout = self.layout
sculpt = context.tool_settings.sculpt
- settings = __class__.paint_settings(context)
split = layout.split()
Modified: trunk/blender/release/scripts/startup/keyingsets_builtins.py
===================================================================
--- trunk/blender/release/scripts/startup/keyingsets_builtins.py 2011-07-10 17:04:56 UTC (rev 38285)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list