svn merge ^/trunk/blender -r43934:43976

4 files changed, 6 insertions, 9 deletions

diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index d5abcb03164..63ba213f9b1 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -327,9 +327,6 @@ def refresh_script_paths():
             _sys_path_ensure(path)
 
 
-_presets = _os.path.join(_scripts[0], "presets")  # FIXME - multiple paths
-
-
 def preset_paths(subdir):
     """
     Returns a list of paths for a specific preset.
diff --git a/release/scripts/modules/bpy_extras/anim_utils.py b/release/scripts/modules/bpy_extras/anim_utils.py
index 6b0ab1c3adc..c4ec805a72d 100644
--- a/release/scripts/modules/bpy_extras/anim_utils.py
+++ b/release/scripts/modules/bpy_extras/anim_utils.py
@@ -158,7 +158,7 @@ def bake_action(frame_start,
     # -------------------------------------------------------------------------
     # Create action
 
-    # in case animation data hassnt been created
+    # in case animation data hasn't been created
     atd = obj.animation_data_create()
     if action is None:
         action = bpy.data.actions.new("Action")
diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py
index 1f37447a68e..e93036ee9bb 100644
--- a/release/scripts/modules/bpy_extras/mesh_utils.py
+++ b/release/scripts/modules/bpy_extras/mesh_utils.py
@@ -166,7 +166,7 @@ def edge_loops_from_faces(mesh, faces=None, seams=()):
             flipped = False
 
             while 1:
-                # from knowing the last 2, look for th next.
+                # from knowing the last 2, look for the next.
                 ed_adj = edges[context_loop[-1]]
                 if len(ed_adj) != 2:
                     # the original edge had 2 other edges
@@ -174,7 +174,7 @@ def edge_loops_from_faces(mesh, faces=None, seams=()):
                         flipped = True  # only flip the list once
                         context_loop.reverse()
                         ed_adj[:] = []
-                        context_loop.append(other_dir)  # save 1 lookiup
+                        context_loop.append(other_dir)  # save 1 look-up
 
                         ed_adj = edges[context_loop[-1]]
                         if len(ed_adj) != 2:
@@ -374,7 +374,7 @@ def ngon_tesselate(from_data, indices, fix_loops=True):
             if s1[0][1] == s1[-1][1]:  # remove endpoints double
                 s1.pop()
 
-            s2[:] = []  # Empty this segment s2 so we dont use it again.
+            s2[:] = []  # Empty this segment s2 so we don't use it again.
             return True
 
         joining_segments = True
diff --git a/release/scripts/modules/console/complete_import.py b/release/scripts/modules/console/complete_import.py
index 63f15d9cf77..8f2b5324cdc 100644
--- a/release/scripts/modules/console/complete_import.py
+++ b/release/scripts/modules/console/complete_import.py
@@ -44,7 +44,7 @@ changes have been made:
 import os
 import sys
 
-TIMEOUT_STORAGE = 3  # Time in secs after which the rootmodules will be stored
+TIMEOUT_STORAGE = 3  # Time in secs after which the root-modules will be stored
 TIMEOUT_GIVEUP = 20  # Time in secs after which we give up
 
 ROOT_MODULES = None
@@ -53,7 +53,7 @@ ROOT_MODULES = None
 def get_root_modules():
     """
     Returns a list containing the names of all the modules available in the
-    folders of the pythonpath.
+    folders of the python-path.
 
     :returns: modules
     :rtype: list