[Bf-blender-cvs] [db043e7e5b4] master: Cleanup: naming for BKE_fluid particle functions

Campbell Barton noreply at git.blender.org
Tue Dec 17 04:08:12 CET 2019


Commit: db043e7e5b4cd2a6feedc70ef9267fc0bf54d78e
Author: Campbell Barton
Date:   Tue Dec 17 12:17:57 2019 +1100
Branches: master
https://developer.blender.org/rBdb043e7e5b4cd2a6feedc70ef9267fc0bf54d78e

Cleanup: naming for BKE_fluid particle functions

Create/Destroy are more commonly paired terms in BLI/BKE API's.

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

M	source/blender/blenkernel/BKE_fluid.h
M	source/blender/blenkernel/intern/fluid.c
M	source/blender/makesrna/intern/rna_fluid.c

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

diff --git a/source/blender/blenkernel/BKE_fluid.h b/source/blender/blenkernel/BKE_fluid.h
index 6c182994890..3e389cfec58 100644
--- a/source/blender/blenkernel/BKE_fluid.h
+++ b/source/blender/blenkernel/BKE_fluid.h
@@ -58,12 +58,12 @@ void BKE_fluid_cache_free(struct FluidDomainSettings *mds, struct Object *ob, in
 float BKE_fluid_get_velocity_at(struct Object *ob, float position[3], float velocity[3]);
 int BKE_fluid_get_data_flags(struct FluidDomainSettings *mds);
 
-void BKE_fluid_create_particle_system(struct Main *bmain,
+void BKE_fluid_particle_system_create(struct Main *bmain,
                                       struct Object *ob,
                                       const char *pset_name,
                                       const char *parts_name,
                                       const char *psys_name,
                                       const int psys_type);
-void BKE_fluid_delete_particle_system(struct Object *ob, const int particle_type);
+void BKE_fluid_particle_system_destroy(struct Object *ob, const int particle_type);
 
 #endif /* __BKE_FLUID_H__ */
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index a11a713c617..284799fa17f 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -4754,7 +4754,7 @@ int BKE_fluid_get_data_flags(FluidDomainSettings *mds)
   return flags;
 }
 
-void BKE_fluid_create_particle_system(struct Main *bmain,
+void BKE_fluid_particle_system_create(struct Main *bmain,
                                       struct Object *ob,
                                       const char *pset_name,
                                       const char *parts_name,
@@ -4786,7 +4786,7 @@ void BKE_fluid_create_particle_system(struct Main *bmain,
   modifier_unique_name(&ob->modifiers, (ModifierData *)pmmd);
 }
 
-void BKE_fluid_delete_particle_system(struct Object *ob, const int particle_type)
+void BKE_fluid_particle_system_destroy(struct Object *ob, const int particle_type)
 {
   ParticleSystemModifierData *pmmd;
   ParticleSystem *psys, *next_psys;
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 11897ab5e2a..d879d5cc315 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -126,7 +126,7 @@ static void rna_Fluid_parts_create(Main *bmain,
   UNUSED_VARS(bmain, ptr, pset_name, parts_name, psys_name, psys_type);
 #  else
   Object *ob = (Object *)ptr->owner_id;
-  BKE_fluid_create_particle_system(bmain, ob, pset_name, parts_name, psys_name, psys_type);
+  BKE_fluid_particle_system_create(bmain, ob, pset_name, parts_name, psys_name, psys_type);
 #  endif
 }
 
@@ -136,7 +136,7 @@ static void rna_Fluid_parts_delete(PointerRNA *ptr, int ptype)
   UNUSED_VARS(ptr, ptype);
 #  else
   Object *ob = (Object *)ptr->owner_id;
-  BKE_fluid_delete_particle_system(ob, ptype);
+  BKE_fluid_particle_system_destroy(ob, ptype);
 #  endif
 }



More information about the Bf-blender-cvs mailing list