Merge branch 'master' into blender2.8

4 files changed, 17 insertions, 17 deletions

diff --git a/add_advanced_objects_menu/cubester.py b/add_advanced_objects_menu/cubester.py
index 87322f4f..f93adbb8 100644
--- a/add_advanced_objects_menu/cubester.py
+++ b/add_advanced_objects_menu/cubester.py
@@ -201,7 +201,7 @@ def create_mesh_from_audio(self, scene, verts, faces):
     bpy.context.scene.objects.active = ob
     ob.select = True
 
-    # inital vertex colors
+    # initial vertex colors
     if adv_obj.cubester_materials == "image" and adv_obj.cubester_color_image != "":
         picture = bpy.data.images[adv_obj.cubester_color_image]
         pixels = list(picture.pixels)
@@ -727,7 +727,7 @@ class CubeSterPanel(Panel):
             box.prop_search(adv_obj, "cubester_image", bpy.data, "images")
             box.prop(adv_obj, "cubester_load_image")
 
-            # find number of approriate images if sequence
+            # find number of appropriate images if sequence
             if adv_obj.cubester_load_type == "multiple":
                 box = layout.box()
                 # display number of images found there
@@ -787,7 +787,7 @@ class CubeSterPanel(Panel):
         if adv_obj.cubester_materials == "image":
             box.prop(adv_obj, "cubester_load_type")
 
-            # find number of approriate images if sequence
+            # find number of appropriate images if sequence
             if adv_obj.cubester_load_type == "multiple":
                 # display number of images found there
                 images = find_sequence_images(self, context)
diff --git a/add_advanced_objects_menu/mesh_easylattice.py b/add_advanced_objects_menu/mesh_easylattice.py
index 78f3d020..3eb483e2 100644
--- a/add_advanced_objects_menu/mesh_easylattice.py
+++ b/add_advanced_objects_menu/mesh_easylattice.py
@@ -48,7 +48,7 @@ def createLattice(context, obj, props):
     lat = bpy.data.lattices.new('EasyLattice')
     ob = bpy.data.objects.new('EasyLattice', lat)
 
-    # Take into consideration any selected vertices (default: all verticies)
+    # Take into consideration any selected vertices (default: all vertices)
     selectedVertices = createVertexGroup(obj)
 
     size, pos = findBBox(obj, selectedVertices)
@@ -172,7 +172,7 @@ def findBBox(obj, selvertsarray):
 def buildTrnSclMat(obj):
     # This function builds a local matrix that encodes translation
     # and scale and it leaves out the rotation matrix
-    # The rotation is applied at obejct level if there is any
+    # The rotation is applied at object level if there is any
     mat_trans = Matrix.Translation(obj.location)
     mat_scale = Matrix.Scale(obj.scale[0], 4, (1, 0, 0))
     mat_scale *= Matrix.Scale(obj.scale[1], 4, (0, 1, 0))
@@ -186,7 +186,7 @@ def buildTrnSclMat(obj):
 def buildTrnScl_WorldMat(obj):
     # This function builds a real world matrix that encodes translation
     # and scale and it leaves out the rotation matrix
-    # The rotation is applied at obejct level if there is any
+    # The rotation is applied at object level if there is any
     loc, rot, scl = obj.matrix_world.decompose()
     mat_trans = Matrix.Translation(loc)
 
@@ -215,7 +215,7 @@ def buildRot_WorldMat(obj):
 def buildTrn_WorldMat(obj):
     # This function builds a real world matrix that encodes translation
     # and scale and it leaves out the rotation matrix
-    # The rotation is applied at obejct level if there is any
+    # The rotation is applied at object level if there is any
     loc, rot, scl = obj.matrix_world.decompose()
     mat_trans = Matrix.Translation(loc)
 
@@ -225,7 +225,7 @@ def buildTrn_WorldMat(obj):
 def buildScl_WorldMat(obj):
     # This function builds a real world matrix that encodes translation
     # and scale and it leaves out the rotation matrix
-    # The rotation is applied at obejct level if there is any
+    # The rotation is applied at object level if there is any
     loc, rot, scl = obj.matrix_world.decompose()
 
     mat_scale = Matrix.Scale(scl[0], 4, (1, 0, 0))
diff --git a/add_advanced_objects_menu/object_add_chain.py b/add_advanced_objects_menu/object_add_chain.py
index 8b182c82..0ae29145 100644
--- a/add_advanced_objects_menu/object_add_chain.py
+++ b/add_advanced_objects_menu/object_add_chain.py
@@ -75,7 +75,7 @@ def Add_Chain():
     # Positions Torus primitive to center of scene
     bpy.context.active_object.location = 0.0, 0.0, 0.0
 
-    # Reseting Torus rotation in case of 'Align to view' option enabled
+    # Resetting Torus rotation in case of 'Align to view' option enabled
     bpy.context.active_object.rotation_euler = 0.0, 0.0, 0.0
 
     # Changes Torus name to chain adds variable tor
diff --git a/add_advanced_objects_menu/rope_alpha.py b/add_advanced_objects_menu/rope_alpha.py
index 4ef23fc1..f0bd5dd7 100644
--- a/add_advanced_objects_menu/rope_alpha.py
+++ b/add_advanced_objects_menu/rope_alpha.py
@@ -204,7 +204,7 @@ class ClothRope(Operator):
     bl_description = ("Create a new Scene with a Cloth modifier\n"
                       "Rope Simulation with hooked Helper Objects")
 
-    ropelenght = IntProperty(
+    ropelength = IntProperty(
             name="Rope Length",
             description="Length of the generated Rope",
             default=5
@@ -249,7 +249,7 @@ class ClothRope(Operator):
         scene = bpy.context.scene
         scene.name = "Test Rope"
         seleccionar_todo()
-        longitud = self.ropelenght
+        longitud = self.ropelength
 
         # For the middle to have x segments between the first and
         # last point, must add 1 to the quantity:
@@ -333,10 +333,10 @@ class ClothRope(Operator):
         entrar_en_editmode()  # enter edit mode
         bpy.ops.object.vertex_group_add()  # Creating Master guide group
         select_all_in_edit_mode(ob)
-        bpy.ops.object.vertex_group_assign()  # and assing it
+        bpy.ops.object.vertex_group_assign()  # and assign it
         ob.vertex_groups[1].name = "Guide_rope"
 
-        # extrude the Curve so it has a minumum thickness for collide
+        # extrude the Curve so it has a minimum thickness for collide
         bpy.ops.mesh.extrude_region_move(
                 MESH_OT_extrude_region={"mirror": False},
                 TRANSFORM_OT_translate={
@@ -485,7 +485,7 @@ class ClothRope(Operator):
 
         col.label("Rope settings:")
         rowsub0 = col.row()
-        rowsub0.prop(self, "ropelenght", text="Length")
+        rowsub0.prop(self, "ropelength", text="Length")
         rowsub0.prop(self, "ropesegments", text="Segments")
         rowsub0.prop(self, "radiusrope", text="Radius")
 
@@ -502,7 +502,7 @@ class BallRope(Operator):
                       "Wrecking Ball on a rope")
 
     # defaults rope ball
-    ropelenght2 = IntProperty(
+    ropelength2 = IntProperty(
             name="Rope Length",
             description="Length of the Wrecking Ball rope",
             default=10
@@ -564,7 +564,7 @@ class BallRope(Operator):
     def execute(self, context):
         world_steps = self.worldsteps
         solver_iterations = self.solveriterations
-        longitud = self.ropelenght2
+        longitud = self.ropelength2
 
         # make a + 2, so the segments will be between the two end points...
         segmentos = self.ropesegments2 + 2
@@ -800,7 +800,7 @@ class BallRope(Operator):
         rowsub0.prop(self, "hidecubes", text="Hide Link Cubes")
 
         rowsub1 = col.row(align=True)
-        rowsub1.prop(self, "ropelenght2", text="Length")
+        rowsub1.prop(self, "ropelength2", text="Length")
         rowsub1.prop(self, "ropesegments2", text="Segments")
 
         rowsub2 = col.row(align=True)