[Bf-blender-cvs] [dc15562b7cb] soc-2021-simulation-display: Cleanup: Correct variable name while storing effectors force.

[soumya pochiraju]

Commit: dc15562b7cb695b68066071ae2a09fec6e6ad479
Author: soumya pochiraju
Date:   Thu Aug 12 08:19:42 2021 +0530
Branches: soc-2021-simulation-display
https://developer.blender.org/rBdc15562b7cb695b68066071ae2a09fec6e6ad479

Cleanup: Correct variable name while storing effectors force.

No functional changes.

===================================================================

M	source/blender/blenkernel/BKE_effect.h
M	source/blender/blenkernel/intern/effect.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h
index b7d9bd2a449..74b82d6406c 100644
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@ -130,7 +130,7 @@ void BKE_effectors_apply(struct ListBase *effectors,
                          float *force,
                          float *wind_force,
                          float *impulse,
-                         float eff_forces[3][3]);
+                         float r_eff_forces[3][3]);
 void BKE_effectors_free(struct ListBase *lb);
 
 void pd_point_from_particle(struct ParticleSimulationData *sim,
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index a067eea0b2f..98da104ed23 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -1149,7 +1149,7 @@ void BKE_effectors_apply(ListBase *effectors,
                          float *force,
                          float *wind_force,
                          float *impulse,
-                         float eff_forces[3][3])
+                         float r_eff_forces[3][3])
 {
   /*
    * Modifies the force on a particle according to its
@@ -1214,12 +1214,12 @@ void BKE_effectors_apply(ListBase *effectors,
           add_v3_v3v3(impulse, impulse, efd.vel);
         }
 
-        if (eff_forces != NULL) {
+        if (r_eff_forces != NULL) {
           if (eff->flag & PE_VELOCITY_TO_IMPULSE && impulse) {
-            copy_v3_v3(eff_forces[num_eff_forces], impulse);
+            copy_v3_v3(r_eff_forces[num_eff_forces], impulse);
           }
           else {
-            copy_v3_v3(eff_forces[num_eff_forces], force);
+            copy_v3_v3(r_eff_forces[num_eff_forces], force);
           }
         }
       }