svn merge ^/trunk/blender -r42778:42839

2011-12-23 08:41:53 +00:00
parent 87a3477200 ac498a6b64
commit 4ced91da47
116 changed files with 2071 additions and 737 deletions
--- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py
+++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
@@ -756,7 +756,7 @@ def VectoQuat(vec):


 class thickface(object):
-    __slots__= ('v', 'uv', 'no', 'area', 'edge_keys')
+    __slost__= "v", "uv", "no", "area", "edge_keys"
    def __init__(self, face, uv_layer, mesh_verts):
        self.v = [mesh_verts[i] for i in face.vertices]
        self.uv = [uv_layer[i].uv for i in face.loops]