diff options
-rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_cloth_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_cloth.c | 20 | ||||
-rw-r--r-- | source/blender/physics/intern/BPH_mass_spring.cpp | 2 | ||||
-rw-r--r-- | source/blender/physics/intern/hair_volume.cpp | 11 | ||||
-rw-r--r-- | source/blender/physics/intern/implicit.h | 1 |
6 files changed, 0 insertions, 46 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 9e8804328c2..1176245da83 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -361,11 +361,6 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): sub.prop(cloth, "density_target", text="Density Target") sub.prop(cloth, "density_strength", slider=True, text="Strength") col.prop(cloth, "voxel_cell_size") - sub = col.column(align=True) - sub.prop(cloth, "debug1") - sub.prop(cloth, "debug2") - sub.prop(cloth, "debug3") - sub.prop(cloth, "debug4") split.separator() @@ -381,7 +376,6 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): row = col.row() row.prop(psys.settings, "show_hair_grid", text="HairGrid") - row.prop(cloth_md, "show_debug_data", text="Debug") if result: box = layout.box() diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index a665c22f2a0..3144dadb680 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -76,12 +76,6 @@ typedef struct ClothSimSettings { float shrink_min; /* min amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */ float shrink_max; /* max amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */ - /* XXX generic debug values, could be done nicer as id props */ - float debug1; - float debug2; - int debug3; - int debug4; - /* XXX various hair stuff * should really be separate, this struct is a horrible mess already */ diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index 4e8cfb8303d..991020a1574 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -397,26 +397,6 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Target Density Strength", "Influence of target density on the simulation"); RNA_def_property_update(prop, 0, "rna_cloth_update"); - prop = RNA_def_property(srna, "debug1", PROP_FLOAT, PROP_NONE); - RNA_def_property_range(prop, 0.0f, 1000000.0f); - RNA_def_property_ui_text(prop, "Debug1", ""); - RNA_def_property_update(prop, 0, "rna_cloth_update"); - - prop = RNA_def_property(srna, "debug2", PROP_FLOAT, PROP_NONE); - RNA_def_property_range(prop, 0.0f, 1000000.0f); - RNA_def_property_ui_text(prop, "Debug2", ""); - RNA_def_property_update(prop, 0, "rna_cloth_update"); - - prop = RNA_def_property(srna, "debug3", PROP_INT, PROP_NONE); - RNA_def_property_range(prop, 0.0f, 1000000.0f); - RNA_def_property_ui_text(prop, "Debug3", ""); - RNA_def_property_update(prop, 0, "rna_cloth_update"); - - prop = RNA_def_property(srna, "debug4", PROP_INT, PROP_NONE); - RNA_def_property_range(prop, 0.0f, 1000000.0f); - RNA_def_property_ui_text(prop, "Debug4", ""); - RNA_def_property_update(prop, 0, "rna_cloth_update"); - /* mass */ prop = RNA_def_property(srna, "mass", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index a4f4fb1dcee..6cddbc6aa46 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -712,8 +712,6 @@ static void cloth_continuum_step(ClothModifierData *clmd, float dt) if (smoothfac > 0.0f || density_strength > 0.0f) {
HairGrid *grid = BPH_hair_volume_create_vertex_grid(clmd->sim_parms->voxel_cell_size, gmin, gmax);
- BPH_hair_volume_set_debug_value(grid, parms->debug1, parms->debug2, parms->debug3, parms->debug4);
-
cloth_continuum_fill_grid(grid, cloth);
/* main hair continuum solver */
diff --git a/source/blender/physics/intern/hair_volume.cpp b/source/blender/physics/intern/hair_volume.cpp index 3e98d3b60c3..b07af1d201c 100644 --- a/source/blender/physics/intern/hair_volume.cpp +++ b/source/blender/physics/intern/hair_volume.cpp @@ -91,9 +91,6 @@ typedef struct HairGrid { int res[3]; float gmin[3], gmax[3]; float cellsize, inv_cellsize; - - float debug1, debug2; - int debug3, debug4; } HairGrid; #define HAIR_GRID_INDEX_AXIS(vec, res, gmin, scale, axis) ( min_ii( max_ii( (int)((vec[axis] - gmin[axis]) * scale), 0), res[axis]-2 ) ) @@ -1023,14 +1020,6 @@ void BPH_hair_volume_free_vertex_grid(HairGrid *grid) } } -void BPH_hair_volume_set_debug_value(HairGrid *grid, float debug1, float debug2, int debug3, int debug4) -{ - grid->debug1 = debug1; - grid->debug2 = debug2; - grid->debug3 = debug3; - grid->debug4 = debug4; -} - void BPH_hair_volume_grid_geometry(HairGrid *grid, float *cellsize, int res[3], float gmin[3], float gmax[3]) { if (cellsize) *cellsize = grid->cellsize; diff --git a/source/blender/physics/intern/implicit.h b/source/blender/physics/intern/implicit.h index f0d59d92c91..7ded479f578 100644 --- a/source/blender/physics/intern/implicit.h +++ b/source/blender/physics/intern/implicit.h @@ -139,7 +139,6 @@ struct VoxelData; struct HairGrid *BPH_hair_volume_create_vertex_grid(float cellsize, const float gmin[3], const float gmax[3]); void BPH_hair_volume_free_vertex_grid(struct HairGrid *grid); void BPH_hair_volume_grid_geometry(struct HairGrid *grid, float *cellsize, int res[3], float gmin[3], float gmax[3]); -void BPH_hair_volume_set_debug_value(struct HairGrid *grid, float debug1, float debug2, int debug3, int debug4); void BPH_hair_volume_grid_clear(struct HairGrid *grid); void BPH_hair_volume_add_vertex(struct HairGrid *grid, const float x[3], const float v[3]); |