diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-08 03:36:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-08 03:36:32 +0400 |
commit | f5f7ed433c2e0c830ead8e8a665a056cb6dcfced (patch) | |
tree | 6adf1606b8484d518ca69d7b898438095e05b333 /release/scripts | |
parent | 698b8930faa8c95bbc28be4e24109c3ff4f67697 (diff) |
fix [#28558] more edge_keys than edges
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/modules/bpy_types.py | 29 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 8 |
2 files changed, 27 insertions, 10 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 101416f4943..ef03951108f 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -356,7 +356,10 @@ class Mesh(bpy_types.ID): @property def edge_keys(self): - return [edge_key for face in self.faces for edge_key in face.edge_keys] + return list({edge_key + for face in self.faces + for edge_key in face.edge_keys + }) class MeshEdge(StructRNA): @@ -376,17 +379,31 @@ class MeshFace(StructRNA): face_verts = self.vertices[:] mesh_verts = self.id_data.vertices if len(face_verts) == 3: - return (mesh_verts[face_verts[0]].co + mesh_verts[face_verts[1]].co + mesh_verts[face_verts[2]].co) / 3.0 + return (mesh_verts[face_verts[0]].co + + mesh_verts[face_verts[1]].co + + mesh_verts[face_verts[2]].co + ) / 3.0 else: - return (mesh_verts[face_verts[0]].co + mesh_verts[face_verts[1]].co + mesh_verts[face_verts[2]].co + mesh_verts[face_verts[3]].co) / 4.0 + return (mesh_verts[face_verts[0]].co + + mesh_verts[face_verts[1]].co + + mesh_verts[face_verts[2]].co + + mesh_verts[face_verts[3]].co + ) / 4.0 @property def edge_keys(self): verts = self.vertices[:] if len(verts) == 3: - return ord_ind(verts[0], verts[1]), ord_ind(verts[1], verts[2]), ord_ind(verts[2], verts[0]) - - return ord_ind(verts[0], verts[1]), ord_ind(verts[1], verts[2]), ord_ind(verts[2], verts[3]), ord_ind(verts[3], verts[0]) + return (ord_ind(verts[0], verts[1]), + ord_ind(verts[1], verts[2]), + ord_ind(verts[2], verts[0]), + ) + else: + return (ord_ind(verts[0], verts[1]), + ord_ind(verts[1], verts[2]), + ord_ind(verts[2], verts[3]), + ord_ind(verts[3], verts[0]), + ) class Text(bpy_types.ID): diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 058e8161fe6..348ca554e63 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -738,7 +738,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "narrowness", slider=True) @staticmethod - def weight_vg_mask(layout, ob, md): + def vertex_weight_mask(layout, ob, md): layout.label(text="Influence/Mask Options:") split = layout.split() col1 = split.column() @@ -798,7 +798,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): # Common mask options… layout.separator() - self.weight_vg_mask(layout, ob, md) + self.vertex_weight_mask(layout, ob, md) def VERTEX_WEIGHT_MIX(self, layout, ob, md): if ob.type == 'MESH': @@ -823,7 +823,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): # Common mask options… layout.separator() - self.weight_vg_mask(layout, ob, md) + self.vertex_weight_mask(layout, ob, md) def VERTEX_WEIGHT_PROXIMITY(self, layout, ob, md): if ob.type == 'MESH': @@ -850,7 +850,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): # Common mask options… layout.separator() - self.weight_vg_mask(layout, ob, md) + self.vertex_weight_mask(layout, ob, md) if __name__ == "__main__": # only for live edit. bpy.utils.register_module(__name__) |