Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2015-01-21 12:07:11 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-21 12:07:11 +0300
commit47bf0934f5743d14024ef693b2bfe4510c2c666a (patch)
tree0e43269c789c7b6fb0cc31904a94f036f948ca3e /source/blender/physics
parent4422ecbb960e88c1b63ebaa325d5d44d052d095f (diff)
Removed generic debug1..4 values from the cloth data.
These were used as UI buttons during development. If such parameters are needed again later they should instead be added in the (now global) SimDebugData and made accessible with a dev addon or so.
Diffstat (limited to 'source/blender/physics')
-rw-r--r--source/blender/physics/intern/BPH_mass_spring.cpp2
-rw-r--r--source/blender/physics/intern/hair_volume.cpp11
-rw-r--r--source/blender/physics/intern/implicit.h1
3 files changed, 0 insertions, 14 deletions
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]);