[Bf-extensions-cvs] [dc314a71] master: ant landscape: other required updates for 2.8

[Philipp Oeser]

Commit: dc314a71c81b5bbb1dafa1a6b20d532d13b04e0b
Author: Philipp Oeser
Date:   Sat Mar 9 12:52:11 2019 +0100
Branches: master
https://developer.blender.org/rBAdc314a71c81b5bbb1dafa1a6b20d532d13b04e0b

ant landscape: other required updates for 2.8

===================================================================

M	ant_landscape/__init__.py
M	ant_landscape/ant_functions.py

===================================================================

diff --git a/ant_landscape/__init__.py b/ant_landscape/__init__.py
index 7b396bb2..7b30f821 100644
--- a/ant_landscape/__init__.py
+++ b/ant_landscape/__init__.py
@@ -138,7 +138,7 @@ class AntMainSettingsPanel(bpy.types.Panel):
         col.operator('mesh.ant_landscape_regenerate', text="Regenerate", icon="LOOP_FORWARDS")
         row = box.row(align=True)
         split = row.split(align=True)
-        split.prop(ant, "smooth_mesh", toggle=True, text="Smooth", icon='SOLID')
+        split.prop(ant, "smooth_mesh", toggle=True, text="Smooth", icon='SHADING_SOLID')
         split.prop(ant, "tri_face", toggle=True, text="Triangulate", icon='MESH_DATA')
         if ant.sphere_mesh:
             split.prop(ant, "remove_double", toggle=True, text="Remove Doubles", icon='MESH_DATA')
@@ -347,7 +347,7 @@ class AntNoiseSettingsPanel(bpy.types.Panel):
             col.prop(ant, "fx_turb")
 
             col = box.column(align=True)
-            row = col.row(align=True).split(0.92, align=True)
+            row = col.row(align=True).split(factor=0.92, align=True)
             row.prop(ant, "fx_height")
             row.prop(ant, "fx_invert", toggle=True, text="", icon='ARROW_LEFTRIGHT')
             col.prop(ant, "fx_offset")
@@ -381,7 +381,7 @@ class AntDisplaceSettingsPanel(bpy.types.Panel):
             col.operator('mesh.ant_landscape_refresh', text="Refresh", icon="FILE_REFRESH")
 
         col = box.column(align=True)
-        row = col.row(align=True).split(0.92, align=True)
+        row = col.row(align=True).split(factor=0.92, align=True)
         row.prop(ant, "height")
         row.prop(ant, "height_invert", toggle=True, text="", icon='ARROW_LEFTRIGHT')
         col.prop(ant, "height_offset")
@@ -567,7 +567,7 @@ class AntLandscapePropertiesGroup(bpy.types.PropertyGroup):
             name="vlNoise Basis",
             default=ant_noise.noise_basis_default,
             description="VLNoise basis algorithms",
-            items =  ant_noise.noise_basis
+            items = ant_noise.noise_basis
             )
     distortion: FloatProperty(
             name="Distortion",
diff --git a/ant_landscape/ant_functions.py b/ant_landscape/ant_functions.py
index 3f2c6103..62fe4916 100644
--- a/ant_landscape/ant_functions.py
+++ b/ant_landscape/ant_functions.py
@@ -151,12 +151,12 @@ class AntLandscapeRefresh(bpy.types.Operator):
         bpy.ops.object.mode_set(mode = 'EDIT')
         bpy.ops.object.mode_set(mode = 'OBJECT')
 
-        if obj and obj.ant_landscape.keys():
+        keys = obj.ant_landscape.keys()
+        if keys:
             ob = obj.ant_landscape
-            obi = ob.items()
             prop = []
-            for i in range(len(obi)):
-                prop.append(obi[i][1])
+            for key in keys:
+                prop.append(getattr(ob, key))
 
             # redraw verts
             mesh = obj.data
@@ -209,12 +209,12 @@ class AntLandscapeRegenerate(bpy.types.Operator):
         # ant object items
         obj = bpy.context.active_object
 
-        if obj and obj.ant_landscape.keys():
+        keys = obj.ant_landscape.keys()
+        if keys:
             ob = obj.ant_landscape
-            obi = ob.items()
             ant_props = []
-            for i in range(len(obi)):
-                ant_props.append(obi[i][1])
+            for key in keys:
+                ant_props.append(getattr(ob, key))
 
             new_name = obj.name
 
@@ -230,7 +230,7 @@ class AntLandscapeRegenerate(bpy.types.Operator):
                         False,
                         0.0
                         )
-                new_ob = create_mesh_object(context, verts, [], faces, new_name).object
+                new_ob = create_mesh_object(context, verts, [], faces, new_name)
                 if ob['remove_double']:
                     new_ob.select_set(True)
                     bpy.ops.object.mode_set(mode = 'EDIT')
@@ -248,7 +248,7 @@ class AntLandscapeRegenerate(bpy.types.Operator):
                         False,
                         0.0
                         )
-                new_ob = create_mesh_object(context, verts, [], faces, new_name).object
+                new_ob = create_mesh_object(context, verts, [], faces, new_name)
 
             new_ob.select_set(True)
 
@@ -273,7 +273,7 @@ class AntLandscapeRegenerate(bpy.types.Operator):
                             ob['water_plane'],
                             ob['water_level']
                             )
-                    wobj = create_mesh_object(context, verts, [], faces, new_name+"_plane").object
+                    wobj = create_mesh_object(context, verts, [], faces, new_name+"_plane")
                     if ob['remove_double']:
                         wobj.select_set(True)
                         bpy.ops.object.mode_set(mode = 'EDIT')
@@ -291,7 +291,7 @@ class AntLandscapeRegenerate(bpy.types.Operator):
                             ob['water_plane'],
                             ob['water_level']
                             )
-                    wobj = create_mesh_object(context, verts, [], faces, new_name+"_plane").object
+                    wobj = create_mesh_object(context, verts, [], faces, new_name+"_plane")
 
                 wobj.select_set(True)
 
@@ -406,7 +406,7 @@ class AntVgSlopeMap(bpy.types.Operator):
 
             if self.select_flat:
                 if zval >= (1.0 - self.select_range):
-                    v.select_set(True)
+                    v.select = True
 
         vg_normal.name = self.group_name
 
@@ -1095,13 +1095,13 @@ class Eroder(bpy.types.Operator):
 
         box = layout.box()
         col = box.column(align=True)
-        col.label("Thermal (Diffusion)")
+        col.label(text="Thermal (Diffusion)")
         col.prop(self, 'Kd')
         col.prop(self, 'IterDiffuse')
 
         box = layout.box()
         col = box.column(align=True)
-        col.label("Avalanche (Talus)")
+        col.label(text="Avalanche (Talus)")
         col.prop(self, 'Pa')
         col.prop(self, 'IterAva')
         col.prop(self, 'Kt')