svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender...

[blender-staging.git] / release / scripts / modules / bpy_types.py

diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index 101416f49430971d8c6fe6fa343c506b42d8aa37..4a5de9f9e573ba47385364e01001465496bf4f6d 100644 (file)
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -183,7 +183,7 @@ class _GenericBone:
     @property
     def center(self):
         """The midpoint between the head and the tail."""
     @property
     def center(self):
         """The midpoint between the head and the tail."""

-        return (self.head + self.tail) * 0.5
+        return self.head.lerp(self.tail, 0.5)

 
     @property
     def length(self):
 
     @property
     def length(self):


@@ -330,7 +330,8 @@ class Mesh(bpy_types.ID):
         """
         self.vertices.add(len(vertices))
         self.edges.add(len(edges))
         """
         self.vertices.add(len(vertices))
         self.edges.add(len(edges))

-        self.faces.add(len(faces))
+        self.loops.add(sum((len(f) for f in faces)))
+        self.polygons.add(len(faces))

 
         vertices_flat = [f for v in vertices for f in v]
         self.vertices.foreach_set("co", vertices_flat)
 
         vertices_flat = [f for v in vertices for f in v]
         self.vertices.foreach_set("co", vertices_flat)


@@ -340,19 +341,15 @@ class Mesh(bpy_types.ID):
         self.edges.foreach_set("vertices", edges_flat)
         del edges_flat
 
         self.edges.foreach_set("vertices", edges_flat)
         del edges_flat
 

-        def treat_face(f):
-            if len(f) == 3:
-                if f[2] == 0:
-                    return f[2], f[0], f[1], 0
-                else:
-                    return f[0], f[1], f[2], 0
-            elif f[2] == 0 or f[3] == 0:
-                return f[2], f[3], f[0], f[1]
-            return f
-
-        faces_flat = [v for f in faces for v in treat_face(f)]
-        self.faces.foreach_set("vertices_raw", faces_flat)
-        del faces_flat
+        # this is different in bmesh
+        loop_index = 0
+        for i, p in enumerate(self.polygons):
+            f = faces[i]
+            loop_len = len(f)
+            p.loop_start = loop_index
+            p.loop_total = loop_len
+            p.vertices = f
+            loop_index += loop_len

 
     @property
     def edge_keys(self):
 
     @property
     def edge_keys(self):


@@ -571,7 +568,7 @@ class _GenericUI:
         draw_funcs = cls._dyn_ui_initialize()
         try:
             draw_funcs.remove(draw_func)
         draw_funcs = cls._dyn_ui_initialize()
         try:
             draw_funcs.remove(draw_func)

-        except:
+        except ValueError:

             pass
 
 
             pass