svn merge ^/trunk/blender -r43934:43976

2012-02-08 05:45:16 +00:00
parent 873fe5cb59 054e10ac13
commit 19d0f93099
48 changed files with 308 additions and 168 deletions
--- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py
+++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
@@ -247,10 +247,10 @@ def lightmap_uvpack(meshes,

        pretty_faces = [prettyface(f) for f in face_sel if len(f.vertices) == 4]

-        # Do we have any tri's
+        # Do we have any triangles?
        if len(pretty_faces) != len(face_sel):

-            # Now add tri's, not so simple because we need to pair them up.
+            # Now add triangles, not so simple because we need to pair them up.
            def trylens(f):
                # f must be a tri