Revert the DNA pdef_stickness -> pdef_stickiness part of r48556.
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Jul 2012 07:35:54 +0000 (07:35 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Jul 2012 07:35:54 +0000 (07:35 +0000)
Forgot DNA needed stable names... :/ Correct spelling would involve keeping the old one for load code anyway, so better live with incorrect spelling here.

source/blender/blenkernel/intern/particle_system.c
source/blender/makesdna/DNA_object_force.h
source/blender/makesrna/intern/rna_object_force.c

index 9fbf25b0db3571da105b90389f4aed463bba9d58..65f22ebc88fa13a16b59eeb5d3ce25a92d4a4153 100644 (file)
@@ -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);
index ac5dc14c5305091428f5f261492a0ba50d2f5528..1dd2aa6c59b9186c4ef9a682f0256e248b4b64f6 100644 (file)
@@ -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 */
        
index 555171fcf95cfcec8ee0ec3b5eb215d27125beea..1c8961334086a4b400185e445a14cb8a9e51db6c 100644 (file)
@@ -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");