diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-19 19:13:31 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-19 19:13:31 +0300 |
commit | 1c75533d9cc0693733bacbadecfaac5c504313fb (patch) | |
tree | 865ca6cfc8f2ea136d7ff2462e435151e612d06d /add_advanced_objects_panels | |
parent | 4179941c58871bf85cf275130af0696affa5040f (diff) | |
parent | d7d3233715503ecc15b8dd1973f7e73257e2cbda (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'add_advanced_objects_panels')
-rw-r--r-- | add_advanced_objects_panels/DelaunayVoronoi.py | 8 | ||||
-rw-r--r-- | add_advanced_objects_panels/__init__.py | 2 | ||||
-rw-r--r-- | add_advanced_objects_panels/delaunay_voronoi.py | 4 | ||||
-rw-r--r-- | add_advanced_objects_panels/object_laplace_lightning.py | 12 | ||||
-rw-r--r-- | add_advanced_objects_panels/object_mangle_tools.py | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/add_advanced_objects_panels/DelaunayVoronoi.py b/add_advanced_objects_panels/DelaunayVoronoi.py index dcce7f68..d291d700 100644 --- a/add_advanced_objects_panels/DelaunayVoronoi.py +++ b/add_advanced_objects_panels/DelaunayVoronoi.py @@ -264,10 +264,10 @@ class Context(object): 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 @@ class EdgeList(object): 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): diff --git a/add_advanced_objects_panels/__init__.py b/add_advanced_objects_panels/__init__.py index 7de95cd1..e2f72994 100644 --- a/add_advanced_objects_panels/__init__.py +++ b/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", diff --git a/add_advanced_objects_panels/delaunay_voronoi.py b/add_advanced_objects_panels/delaunay_voronoi.py index 92cd0dad..44e746df 100644 --- a/add_advanced_objects_panels/delaunay_voronoi.py +++ b/add_advanced_objects_panels/delaunay_voronoi.py @@ -157,7 +157,7 @@ class OBJECT_OT_TriangulateButton(Operator): 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 @@ class OBJECT_OT_VoronoiButton(Operator): # 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 diff --git a/add_advanced_objects_panels/object_laplace_lightning.py b/add_advanced_objects_panels/object_laplace_lightning.py index f653de53..15e6730f 100644 --- a/add_advanced_objects_panels/object_laplace_lightning.py +++ b/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) diff --git a/add_advanced_objects_panels/object_mangle_tools.py b/add_advanced_objects_panels/object_mangle_tools.py index 0796fea6..4631f82d 100644 --- a/add_advanced_objects_panels/object_mangle_tools.py +++ b/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 |