Merge branch 'master' into blender2.8

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 @@ def draw(self, context):
             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 @@ def draw(self, context):
         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)

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))

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

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 @@ def execute(self, context):
         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 @@ def execute(self, context):
         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 @@ def draw(self, context):
 
         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 @@ def draw(self, context):
         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)

add_advanced_objects_panels/DelaunayVoronoi.py

@@ -264,10 +264,10 @@ def orderPts(self, edges):
 
     def setClipBuffer(self, xpourcent, ypourcent):
         xmin, xmax, ymin, ymax = self.extent
-        witdh = xmax - xmin
+        width = xmax - xmin
         height = ymax - ymin
-        xmin = xmin - witdh * xpourcent / 100
-        xmax = xmax + witdh * xpourcent / 100
+        xmin = xmin - width * xpourcent / 100
+        xmax = xmax + width * xpourcent / 100
         ymin = ymin - height * ypourcent / 100
         ymax = ymax + height * ypourcent / 100
         self.extent = xmin, xmax, ymin, ymax
@@ -761,7 +761,7 @@ def leftbnd(self, pt):
                     break
                 i += 1
 
-        # Now search linear list of halfedges for the corect one
+        # Now search linear list of halfedges for the correct one
         if (he is self.leftend) or (he is not self.rightend and he.isPointRightOf(pt)):
             he = he.right
             while he is not self.rightend and he.isPointRightOf(pt):

add_advanced_objects_panels/__init__.py

@@ -468,7 +468,7 @@ class AdvancedObjProperties1(PropertyGroup):
             )
     # oscurart_constellation
     constellation_limit = FloatProperty(
-            name="Inital Threshold",
+            name="Initial Threshold",
             description="Edges will be created only if the distance\n"
                         "between vertices is smaller than this value\n"
                         "This is a starting value on Operator Invoke",

add_advanced_objects_panels/delaunay_voronoi.py

@@ -157,7 +157,7 @@ def execute(self, context):
             print("Total :%s faces  %s verts" % (len(faces), len(points_3D)))
             return {'FINISHED'}
 
-        # Get points coodinates
+        # Get points coordinates
         r = obj.rotation_euler
         s = obj.scale
         mesh = obj.data
@@ -244,7 +244,7 @@ def execute(self, context):
         # move the check into the poll
         obj = context.active_object
 
-        # Get points coodinates
+        # Get points coordinates
         r = obj.rotation_euler
         s = obj.scale
         mesh = obj.data

add_advanced_objects_panels/object_laplace_lightning.py

@@ -514,7 +514,7 @@ def writeStokeToSingleMesh(arr, jarr, orig, gs, mct, rpt=None):
 def visualizeArray(cg, oob, gs, vm, vs, vc, vv, rst):
     winmgr = bpy.context.scene.advanced_objects1
     # IN: (cellgrid, origin, gridscale,
-    # mulimesh, single mesh, cubes, voxels, report sting)
+    # mulimesh, single mesh, cubes, voxels, report string)
     origin = oob.location
 
     # deal with vert multi-origins
@@ -613,7 +613,7 @@ def buildCPGraph_WORKINPROGRESS(arr, sti=2):
 def findChargePath(oc, fc, ngraph, restrict=[], partial=True):
     # oc -origin charge index, fc -final charge index
     # ngraph -node graph, restrict- index of sites cannot traverse
-    # partial -return partial path if restriction encounterd
+    # partial -return partial path if restriction encountered
     cList = splitList(ngraph, 0)
     pList = splitList(ngraph, 1)
     aRi = []
@@ -764,7 +764,7 @@ def classifyStroke(sarr, mct, hORDER=1):
     aTIPSi = findTips(sgarr)
 
     # find horder channel roots
-    # hcount = orders bewteen main and side/tips
+    # hcount = orders between main and side/tips
     # !!!still buggy!!!
     hRESTRICT = list(aMAINi)    # add to this after each time
     allHPATHSi = []             # all ho paths: [[h0], [h1]...]
@@ -794,7 +794,7 @@ def classifyStroke(sarr, mct, hORDER=1):
                     hRESTRICT += hri
         curPATHSi = aHPATHSi
 
-    # side branches, final order of heirarchy
+    # side branches, final order of hierarchy
     # from tips that are not in an existing path
     # back to any other point that is already on a path
     aDRAWNi = []
@@ -1159,13 +1159,13 @@ def FSLG():
     winmgr.ORIGIN = obORIGIN.location
     winmgr.GROUNDZ = int((obGROUND.location[2] - winmgr.ORIGIN[2]) / winmgr.GSCALE)
 
-    # 1) insert intial charge(s) point (uses verts if mesh)
+    # 1) insert initial charge(s) point (uses verts if mesh)
     cgrid = [(0, 0, 0)]
 
     if obORIGIN.type == 'MESH':
         debug_prints(
                 func="FSLG",
-                text="Origin object is mesh, 'voxelizing' intial charges from verts"
+                text="Origin object is mesh, 'voxelizing' initial charges from verts"
                 )
         cgrid = voxelByVertex(obORIGIN, winmgr.GSCALE)
 

add_advanced_objects_panels/object_mangle_tools.py

@@ -49,7 +49,7 @@ def move_coordinate(context, co, is_curve=False):
     multiplier = 1
 
     # For curves, we base the multiplier on the circumference formula.
-    # This helps make curve changes more noticable.
+    # This helps make curve changes more noticeable.
     if is_curve:
         multiplier = 2 * pi
     random_mag = advanced_objects.mangle_random_magnitude

add_curve_extra_objects/add_curve_aceous_galore.py

@@ -746,7 +746,7 @@ def setBezierHandles(obj, mode='AUTOMATIC'):
     bpy.ops.object.mode_set(mode='OBJECT', toggle=True)
 
 
-# get array of vertcoordinates acording to splinetype
+# get array of vertcoordinates according to splinetype
 def vertsToPoints(Verts, splineType):
 
     # main vars

add_curve_extra_objects/add_curve_celtic_links.py

@@ -88,7 +88,7 @@ class CelticKnotOperator(Operator):
             )
     crossing_strength = FloatProperty(
             name="Crossing Strength",
-            description="Aligned only: strenth of bezier control points",
+            description="Aligned only: strength of bezier control points",
             soft_min=0,
             subtype="DISTANCE",
             unit="LENGTH"

add_curve_extra_objects/add_curve_simple.py

@@ -817,7 +817,7 @@ class Simple(Operator):
     # general properties
     Types = [('Point', "Point", "Construct a Point"),
              ('Line', "Line", "Construct a Line"),
-             ('Distance', "Distance", "Contruct a two point Distance"),
+             ('Distance', "Distance", "Construct a two point Distance"),
              ('Angle', "Angle", "Construct an Angle"),
              ('Circle', "Circle", "Construct a Circle"),
              ('Ellipse', "Ellipse", "Construct an Ellipse"),
@@ -1526,7 +1526,7 @@ class SimpleVariables(PropertyGroup):
     # general properties
     Types = [('Point', "Point", "Construct a Point"),
              ('Line', "Line", "Construct a Line"),
-             ('Distance', "Distance", "Contruct a two point Distance"),
+             ('Distance', "Distance", "Construct a two point Distance"),
              ('Angle', "Angle", "Construct an Angle"),
              ('Circle', "Circle", "Construct a Circle"),
              ('Ellipse', "Ellipse", "Construct an Ellipse"),

add_curve_extra_objects/add_curve_spirals.py

@@ -43,7 +43,7 @@ def make_spiral(props, context):
     # archemedian and logarithmic can be plotted in cylindrical coordinates
 
     # INPUT: turns->degree->max_phi, steps, direction
-    # Initialise Polar Coordinate Enviroment
+    # Initialise Polar Coordinate Environment
     props.degree = 360 * props.turns     # If you want to make the slider for degree
     steps = props.steps * props.turns    # props.steps[per turn] -> steps[for the whole spiral]
     props.z_scale = props.dif_z * props.turns

add_curve_extra_objects/add_curve_torus_knots.py

@@ -547,8 +547,8 @@ def mode_update_callback(self, context):
             items=SplineTypes,
             )
     bezierHandles = [
-            ('VECTOR', "Vector", "Bezier Hanles type - Vector"),
-            ('AUTOMATIC', "Auto", "Bezier Hanles type - Automatic"),
+            ('VECTOR', "Vector", "Bezier Handles type - Vector"),
+            ('AUTOMATIC', "Auto", "Bezier Handles type - Automatic"),
             ]
     handleType = EnumProperty(
             name="Handle type",

add_curve_extra_objects/add_surface_plane_cone.py

@@ -81,7 +81,7 @@ def execute(self, context):
 
         # add a surface Plane
         bpy.ops.object.add_surface_plane()
-        # save some time, by getting instant acces to those values
+        # save some time, by getting instant access to those values
         ao = context.active_object
         point = ao.data.splines[0].points
 
@@ -95,7 +95,7 @@ def execute(self, context):
         bpy.ops.curve.select_all(action='DESELECT')
 
         # select points 0 and 1, and extrudde them
-        # declaring ao and point again seems necesary...
+        # declaring ao and point again seems necessary...
         ao = context.active_object
         point = ao.data.splines[0].points
         point[0].select = True
@@ -154,7 +154,7 @@ def execute(self, context):
         bpy.ops.object.mode_set(mode='EDIT')
         # deselect all
         bpy.ops.curve.select_all(action='DESELECT')
-        # too shorten alot of lines
+        # too shorten a lot of lines
         point = ao.data.splines[0].points
         # get middle points
 
@@ -165,7 +165,7 @@ def execute(self, context):
         # select non-middle points and delete them
         bpy.ops.curve.select_all(action='INVERT')
         bpy.ops.curve.delete(type='VERT')
-        # declaring this again seems necesary...
+        # declaring this again seems necessary...
         point = ao.data.splines[0].points
         # list of points to be in center, and 2 bu'' s higher
 
@@ -200,7 +200,7 @@ def execute(self, context):
 class MakeSurfaceStar(Operator, MakeSurfaceHelpers):
     bl_idname = "object.add_surface_star"
     bl_label = "Add Surface Star"
-    bl_description = "Contruct a Surface Star"
+    bl_description = "Construct a Surface Star"
     bl_options = {'REGISTER', 'UNDO'}
 
     def execute(self, context):
@@ -282,7 +282,7 @@ def execute(self, context):
 class MakeSurfacePlane(Operator, MakeSurfaceHelpers):
     bl_idname = "object.add_surface_plane"
     bl_label = "Add Surface Plane"
-    bl_description = "Contruct a Surface Plane"
+    bl_description = "Construct a Surface Plane"
     bl_options = {'REGISTER', 'UNDO'}
 
     def execute(self, context):

add_curve_ivygen.py

@@ -67,7 +67,7 @@ def createIvyGeometry(IVY, growLeaves):
     # local_ivyBranchSize = IVY.ivyBranchSize  # * radius * IVY.ivySize
     gaussWeight = (1.0, 2.0, 4.0, 7.0, 9.0, 10.0, 9.0, 7.0, 4.0, 2.0, 1.0)
 
-    # Create a new curve and intialise it
+    # Create a new curve and initialise it
     curve = bpy.data.curves.new("IVY", type='CURVE')
     curve.dimensions = '3D'
     curve.bevel_depth = 1
@@ -277,7 +277,7 @@ def __init__(self,
         self.maxAdhesionDistance = maxAdhesionDistance
         self.maxLength = 0.0
 
-        # Normalize all the weights only on intialisation
+        # Normalize all the weights only on initialisation
         sums = self.primaryWeight + self.randomWeight + self.adhesionWeight
         self.primaryWeight /= sums
         self.randomWeight /= sums
@@ -432,7 +432,7 @@ def collision(ob, pos, new_pos):
     if ray_result[0]:
         # Check whether the collision is going into the object
         if tran_dir.dot(ray_result[2]) < 0.0:
-            # Find projection of the piont onto the plane
+            # Find projection of the point onto the plane
             p0 = tran_new_pos - (tran_new_pos -
                                           ray_result[1]).project(ray_result[2])
             # Reflect in the plane