[Bf-blender-cvs] [d2e0afdd5e0] sculpt-mode-features: disabled a few not-yet-working options for remesh modifier (dilate/erode)

[Martin Felke]

Commit: d2e0afdd5e03afc92e49feded1a5c26cce98173c
Author: Martin Felke
Date:   Sun Apr 7 22:03:26 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rBd2e0afdd5e03afc92e49feded1a5c26cce98173c

disabled a few not-yet-working options for remesh modifier (dilate/erode)

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/makesrna/intern/rna_modifier.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index fa339ba1506..2414c775866 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1204,8 +1204,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
             layout.prop(md, "sharpness")
 
         if md.mode == 'VOXEL':
-           # layout.prop(md, "object")
-           # layout.prop(md, "operation")
+            #layout.prop(md, "object")
+            #layout.prop(md, "operation")
             col = layout.column(align=True)
             col.prop(md, "voxel_size")
             col.prop(md, "isovalue")
@@ -1215,6 +1215,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
                 layout.prop(md, "filter_bias")
                 if md.filter_type in {"GAUSSIAN", "MEDIAN", "MEAN"}:
                     layout.prop(md, "filter_width")
+                if md.filter_type in {"DILATE", "ERODE"}:
+                    layout.prop(md, "filter_iterations")
 
             layout.prop(md, "smooth_normals")
             layout.prop(md, "relax_triangles")
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index f7db7f3be2b..d54f2714120 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4075,8 +4075,8 @@ static void rna_def_modifier_remesh(BlenderRNA *brna)
 		{VOXEL_FILTER_MEDIAN, "MEDIAN", 0, "Median", "Median Filter"},
 		{VOXEL_FILTER_MEAN_CURVATURE, "MEAN_CURVATURE", 0, "Mean Curvature", "Mean Curvature Filter"},
 		{VOXEL_FILTER_LAPLACIAN, "LAPLACIAN", 0, "Laplacian", "Laplacian Filter"},
-		{VOXEL_FILTER_DILATE, "DILATE", 0, "Dilate", "Dilate Filter"},
-		{VOXEL_FILTER_ERODE, "ERODE", 0, "Erode", "Erode Filter"},
+		//{VOXEL_FILTER_DILATE, "DILATE", 0, "Dilate", "Dilate Filter"},
+		//{VOXEL_FILTER_ERODE, "ERODE", 0, "Erode", "Erode Filter"},
 		{0, NULL, 0, NULL, NULL},
 	};
 
@@ -4197,6 +4197,12 @@ static void rna_def_modifier_remesh(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Filter Width", "OpenVDB Levelset Filter Width");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
+	prop = RNA_def_property(srna, "filter_iterations", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_int_sdna(prop, NULL, "filter_iterations");
+	RNA_def_property_range(prop, 0, INT_MAX);
+	RNA_def_property_ui_text(prop, "Filter Iterations", "OpenVDB Levelset Filter Iterations");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
+
 	prop = RNA_def_property(srna, "reproject_vertex_paint", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_REMESH_REPROJECT_VPAINT);
 	RNA_def_property_ui_text(prop, "Reproject Vertex Paint", "Keep the current vertex paint on the new mesh");