[Bf-blender-cvs] [deaa664cc0b] sculpt-mode-features: OpenVDB: Replace dilate and erode with offset on level set

Pablo Dobarro noreply at git.blender.org
Mon Apr 8 02:25:35 CEST 2019


Commit: deaa664cc0b8e93f17628f0048775b65f6688582
Author: Pablo Dobarro
Date:   Mon Apr 8 02:25:11 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rBdeaa664cc0b8e93f17628f0048775b65f6688582

OpenVDB: Replace dilate and erode with offset on level set

Dilate and erode filters are now working

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

M	intern/openvdb/intern/openvdb_level_set.cc
M	source/blender/makesrna/intern/rna_modifier.c

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

diff --git a/intern/openvdb/intern/openvdb_level_set.cc b/intern/openvdb/intern/openvdb_level_set.cc
index c6eb8e6f122..bd2772f027c 100644
--- a/intern/openvdb/intern/openvdb_level_set.cc
+++ b/intern/openvdb/intern/openvdb_level_set.cc
@@ -110,10 +110,10 @@ void OpenVDBLevelSet::OpenVDB_level_set_filter(OpenVDBLevelSet_FilterType filter
 			filter.laplacian();
 		break;
 		case OPENVDB_LEVELSET_FILTER_DILATE:
-			filter.dilate(iterations);
+			filter.offset(-iterations/100.0);
 		break;
 		case OPENVDB_LEVELSET_FILTER_ERODE:
-			filter.erode(iterations);
+			filter.offset(iterations/100.0);
 		break;
 	}
 }
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index d54f2714120..913628cc6de 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},
 	};



More information about the Bf-blender-cvs mailing list