Commit: 8dbb6f0d5dd923c57af74f16bbb0e86333dd0a51
Author: Lukas Tönne
Date: Thu Nov 6 12:36:49 2014 +0100
Branches: master
https://developer.blender.org/rB8dbb6f0d5dd923c57af74f16bbb0e86333dd0a51
Removed unused voxel_filter_size DNA property.
This is an artifact of earlier attempts to implement velocity smoothing,
but doesn't work anyway.
Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp
===================================================================
M source/blender/makesdna/DNA_cloth_types.h
M source/blender/makesrna/intern/rna_cloth.c
M source/blender/physics/intern/BPH_mass_spring.cpp
===================================================================
diff --git a/source/blender/makesdna/DNA_cloth_types.h
b/source/blender/makesdna/DNA_cloth_types.h
index 85c91a5..c32f6db 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -81,7 +81,7 @@ typedef struct ClothSimSettings {
*/
float bending_damping; /* damping of bending springs */
int voxel_res; /* resolution of voxel grid for
interaction */
- int voxel_filter_size; /* filter size for voxel grid */
+ int pad;
int stepsPerFrame; /* Number of time steps per frame.
*/
int flags; /* flags, see CSIMSETT_FLAGS enum above.
*/
diff --git a/source/blender/makesrna/intern/rna_cloth.c
b/source/blender/makesrna/intern/rna_cloth.c
index 4e1c912..ff5f2d2 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -477,15 +477,6 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Voxel Grid Resolution", "Resolution of
the voxel grid for interaction effects");
RNA_def_property_update(prop, 0, "rna_cloth_update");
-#if 0 /* disabled */
- prop = RNA_def_property(srna, "voxel_filter_size", PROP_INT,
PROP_UNSIGNED);
- RNA_def_property_int_sdna(prop, NULL, "voxel_filter_size");
- RNA_def_property_range(prop, 0, 8);
- RNA_def_property_int_default(prop, 0);
- RNA_def_property_ui_text(prop, "Voxel Grid Filter Size", "Number of
cells to use for filtering grid velocity");
- RNA_def_property_update(prop, 0, "rna_cloth_update");
-#endif
-
/* springs */
prop = RNA_def_property(srna, "use_stiffness_scale", PROP_BOOLEAN,
PROP_NONE);
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp
b/source/blender/physics/intern/BPH_mass_spring.cpp
index 6704201..1569396 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -564,11 +564,6 @@ static void cloth_calc_volume_force(ClothModifierData
*clmd)
}
BPH_hair_volume_normalize_vertex_grid(vertex_grid);
-#if 0
- /* apply velocity filter */
- BPH_hair_volume_vertex_grid_filter_box(vertex_grid,
clmd->sim_parms->voxel_filter_size);
-#endif
-
vert = cloth->verts;
for (i = 0; i < numverts; i++, vert++) {
float x[3], v[3], f[3], dfdx[3][3], dfdv[3][3];
@@ -784,11 +779,6 @@ static void cloth_continuum_step(ClothModifierData *clmd)
cloth_continuum_fill_grid(grid, cloth);
-#if 0
- /* apply velocity filter */
- BPH_hair_volume_vertex_grid_filter_box(vertex_grid,
clmd->sim_parms->voxel_filter_size);
-#endif
-
for (i = 0, vert = cloth->verts; i < numverts; i++, vert++) {
float x[3], v[3], nv[3];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
