[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40021] trunk/blender/release/scripts: fix [#28558] more edge_keys than edges
Campbell Barton
ideasman42 at gmail.com
Thu Sep 8 01:36:33 CEST 2011
Revision: 40021
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40021
Author: campbellbarton
Date: 2011-09-07 23:36:32 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
fix [#28558] more edge_keys than edges
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2011-09-07 20:06:04 UTC (rev 40020)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2011-09-07 23:36:32 UTC (rev 40021)
@@ -356,7 +356,10 @@
@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,19 +379,33 @@
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[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]),
+ )
- 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):
__slots__ = ()
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-07 20:06:04 UTC (rev 40020)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-09-07 23:36:32 UTC (rev 40021)
@@ -738,7 +738,7 @@
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 @@
# 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 @@
# 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 @@
# 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__)
More information about the Bf-blender-cvs
mailing list