diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-07-04 11:35:54 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-07-04 11:35:54 +0400 |
| commit | 592196cb701f72780288a3606e5186fd42b6b850 (patch) | |
| tree | b846e5606928472e5cd78bf4c4ae089eaa45fd50 | |
| parent | facc2429ab1dc7741d3e795216a27063ac1192b7 (diff) | |
Revert the DNA pdef_stickness -> pdef_stickiness part of r48556.
Forgot DNA needed stable names... :/ Correct spelling would involve keeping the old one for load code anyway, so better live with incorrect spelling here.
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_force.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 9fbf25b0db3..65f22ebc88f 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3323,7 +3323,7 @@ static int collision_response(ParticleData *pa, ParticleCollision *col, BVHTreeR /* stickiness was possibly added before, so cancel that before calculating new normal velocity */ /* otherwise particles go flying out of the surface because of high reversed sticky velocity */ if (v0_dot < 0.0f) { - v0_dot += pd->pdef_stickiness; + v0_dot += pd->pdef_stickness; if (v0_dot > 0.0f) v0_dot = 0.0f; } @@ -3380,7 +3380,7 @@ static int collision_response(ParticleData *pa, ParticleCollision *col, BVHTreeR } /* add stickiness to surface */ - madd_v3_v3fl(pa->state.vel, pce->nor, -pd->pdef_stickiness); + madd_v3_v3fl(pa->state.vel, pce->nor, -pd->pdef_stickness); /* set coordinates for next iteration */ copy_v3_v3(col->co1, co); diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index ac5dc14c530..1dd2aa6c59b 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -89,7 +89,7 @@ typedef struct PartDeflect { float pdef_perm; /* Chance of particle passing through mesh */ float pdef_frict; /* Friction factor for particle deflection */ float pdef_rfrict; /* Random element of friction for deflection */ - float pdef_stickiness;/* surface particle stickiness */ + float pdef_stickness;/* surface particle stickiness */ float absorption; /* used for forces */ diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 555171fcf95..1c896133408 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -902,7 +902,7 @@ static void rna_def_collision(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); prop = RNA_def_property(srna, "stickiness", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "pdef_stickiness"); + RNA_def_property_float_sdna(prop, NULL, "pdef_stickness"); RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_ui_text(prop, "Stickiness", "Amount of stickiness to surface collision"); RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); |