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 /ant_landscape | |
parent | 4179941c58871bf85cf275130af0696affa5040f (diff) | |
parent | d7d3233715503ecc15b8dd1973f7e73257e2cbda (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'ant_landscape')
-rw-r--r-- | ant_landscape/__init__.py | 2 | ||||
-rw-r--r-- | ant_landscape/add_mesh_ant_landscape.py | 2 | ||||
-rw-r--r-- | ant_landscape/eroder.py | 8 | ||||
-rw-r--r-- | ant_landscape/mesh_ant_displace.py | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ant_landscape/__init__.py b/ant_landscape/__init__.py index 448993d0..fd758e33 100644 --- a/ant_landscape/__init__.py +++ b/ant_landscape/__init__.py @@ -900,7 +900,7 @@ class AntLandscapePropertiesGroup(bpy.types.PropertyGroup): items = [ ("0", "None", "No strata", 0), ("1", "Smooth", "Smooth transitions", 1), - ("2", "Sharp Sub", "Sharp substract transitions", 2), + ("2", "Sharp Sub", "Sharp subtract transitions", 2), ("3", "Sharp Add", "Sharp add transitions", 3), ("4", "Quantize", "Quantize", 4), ("5", "Quantize Mix", "Quantize mixed", 5)] diff --git a/ant_landscape/add_mesh_ant_landscape.py b/ant_landscape/add_mesh_ant_landscape.py index 6a36c42f..f103a6c0 100644 --- a/ant_landscape/add_mesh_ant_landscape.py +++ b/ant_landscape/add_mesh_ant_landscape.py @@ -538,7 +538,7 @@ class AntAddLandscape(bpy.types.Operator): items = [ ("0", "None", "No strata", 0), ("1", "Smooth", "Smooth transitions", 1), - ("2", "Sharp Sub", "Sharp substract transitions", 2), + ("2", "Sharp Sub", "Sharp subtract transitions", 2), ("3", "Sharp Add", "Sharp add transitions", 3), ("4", "Quantize", "Quantize", 4), ("5", "Quantize Mix", "Quantize mixed", 5)] diff --git a/ant_landscape/eroder.py b/ant_landscape/eroder.py index 96474f75..56f2bfca 100644 --- a/ant_landscape/eroder.py +++ b/ant_landscape/eroder.py @@ -145,7 +145,7 @@ class Grid: @staticmethod def fromRaw(filename): """initialize a grid from a Blender .raw file. - currenly suports just rectangular grids of all triangles + currently supports just rectangular grids of all triangles """ g = Grid.fromFile(filename) # we assume tris and an axis aligned grid @@ -156,7 +156,7 @@ class Grid: def _sort(self, expfact): # keep unique vertices only by creating a set and sort first on x then on y coordinate - # using rather slow python sort but couldn;t wrap my head around np.lexsort + # using rather slow python sort but couldn't wrap my head around np.lexsort verts = sorted(list({ tuple(t) for t in self.center[::] })) x = set(c[0] for c in verts) y = set(c[1] for c in verts) @@ -461,7 +461,7 @@ class Grid: def analyze(self): self.neighborgrid() - # just looking at up and left to avoid needless doubel calculations + # just looking at up and left to avoid needless double calculations slopes=np.concatenate((np.abs(self.left - self.center),np.abs(self.up - self.center))) return '\n'.join(["%-15s: %.3f"%t for t in [ ('height average', np.average(self.center)), @@ -542,7 +542,7 @@ if __name__ == "__main__": parser.add_argument('-Gm', dest='gridmesa', type=float, default=0, help='Add mesa with given height') parser.add_argument('-Gr', dest='gridrandom', type=float, default=0, help='Add random values between 0 and given value') parser.add_argument('-m', dest='threads', type=int, default=1, help='number of threads to use') - parser.add_argument('-u', action='store_true', dest='unittest', default=False, help='perfom unittests') + parser.add_argument('-u', action='store_true', dest='unittest', default=False, help='perform unittests') parser.add_argument('-a', action='store_true', dest='analyze', default=False, help='show some statistics of input and output meshes') parser.add_argument('-d', action='store_true', dest='dump', default=False, help='show sediment and water meshes at end of run') parser.add_argument('-n', action='store_true', dest='usenumexpr', default=False, help='use numexpr optimizations') diff --git a/ant_landscape/mesh_ant_displace.py b/ant_landscape/mesh_ant_displace.py index fb691abf..884c72a4 100644 --- a/ant_landscape/mesh_ant_displace.py +++ b/ant_landscape/mesh_ant_displace.py @@ -536,7 +536,7 @@ class AntMeshDisplace(bpy.types.Operator): items = [ ("0", "None", "No strata", 0), ("1", "Smooth", "Smooth transitions", 1), - ("2", "Sharp Sub", "Sharp substract transitions", 2), + ("2", "Sharp Sub", "Sharp subtract transitions", 2), ("3", "Sharp Add", "Sharp add transitions", 3), ("4", "Quantize", "Quantize", 4), ("5", "Quantize Mix", "Quantize mixed", 5)] |