[Bf-blender-cvs] [df747de1fc6] fluid-mantaflow: Mantaflow: Clang format previous commit

Sebastián Barschkis noreply at git.blender.org
Wed Dec 11 16:03:20 CET 2019


Commit: df747de1fc6bc5307c87a3eddfad59070fcaccd2
Author: Sebastián Barschkis
Date:   Wed Dec 11 16:03:13 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBdf747de1fc6bc5307c87a3eddfad59070fcaccd2

Mantaflow: Clang format previous commit

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

M	source/blender/blenkernel/BKE_manta.h
M	source/blender/blenkernel/intern/manta.c
M	source/blender/makesrna/intern/rna_manta.c

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

diff --git a/source/blender/blenkernel/BKE_manta.h b/source/blender/blenkernel/BKE_manta.h
index 78f0394503b..562700d23e8 100644
--- a/source/blender/blenkernel/BKE_manta.h
+++ b/source/blender/blenkernel/BKE_manta.h
@@ -58,7 +58,12 @@ void BKE_manta_cache_free(struct MantaDomainSettings *mds, struct Object *ob, in
 float BKE_manta_get_velocity_at(struct Object *ob, float position[3], float velocity[3]);
 int BKE_manta_get_data_flags(struct MantaDomainSettings *mds);
 
-void BKE_manta_create_particle_system(struct Main *bmain, struct Object *ob, const char *pset_name, const char *parts_name, const char *psys_name, const int psys_type);
+void BKE_manta_create_particle_system(struct Main *bmain,
+                                      struct Object *ob,
+                                      const char *pset_name,
+                                      const char *parts_name,
+                                      const char *psys_name,
+                                      const int psys_type);
 void BKE_manta_delete_particle_system(struct Object *ob, const int particle_type);
 
 #endif /* __BKE_MANTA_H__ */
diff --git a/source/blender/blenkernel/intern/manta.c b/source/blender/blenkernel/intern/manta.c
index 6a445e4c155..b1fa55c3eba 100644
--- a/source/blender/blenkernel/intern/manta.c
+++ b/source/blender/blenkernel/intern/manta.c
@@ -4710,7 +4710,12 @@ int BKE_manta_get_data_flags(MantaDomainSettings *mds)
   return flags;
 }
 
-void BKE_manta_create_particle_system(struct Main *bmain, struct Object *ob, const char *pset_name, const char *parts_name, const char *psys_name, const int psys_type)
+void BKE_manta_create_particle_system(struct Main *bmain,
+                                      struct Object *ob,
+                                      const char *pset_name,
+                                      const char *parts_name,
+                                      const char *psys_name,
+                                      const int psys_type)
 {
   ParticleSystem *psys;
   ParticleSettings *part;
diff --git a/source/blender/makesrna/intern/rna_manta.c b/source/blender/makesrna/intern/rna_manta.c
index 45a608bff2d..f13bec5659f 100644
--- a/source/blender/makesrna/intern/rna_manta.c
+++ b/source/blender/makesrna/intern/rna_manta.c
@@ -305,12 +305,12 @@ static void rna_Manta_combined_export_update(Main *bmain, Scene *scene, PointerR
     if (ob->type == OB_MESH && !rna_Manta_parts_exists(ptr, (PART_MANTA_SPRAY | PART_MANTA_FOAM)))
 
       rna_Manta_parts_delete(ptr, (PART_MANTA_SPRAY | PART_MANTA_FOAM));
-      rna_Manta_parts_create(bmain,
-                             ptr,
-                             "SprayFoamParticleSettings",
-                             "Spray + Foam Particles",
-                             "Spray + Foam Particle System",
-                             (PART_MANTA_SPRAY | PART_MANTA_FOAM));
+    rna_Manta_parts_create(bmain,
+                           ptr,
+                           "SprayFoamParticleSettings",
+                           "Spray + Foam Particles",
+                           "Spray + Foam Particle System",
+                           (PART_MANTA_SPRAY | PART_MANTA_FOAM));
 
     mmd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_SPRAY;
     mmd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_FOAM;
@@ -325,12 +325,12 @@ static void rna_Manta_combined_export_update(Main *bmain, Scene *scene, PointerR
         !rna_Manta_parts_exists(ptr, (PART_MANTA_SPRAY | PART_MANTA_BUBBLE)))
 
       rna_Manta_parts_delete(ptr, (PART_MANTA_SPRAY | PART_MANTA_BUBBLE));
-      rna_Manta_parts_create(bmain,
-                             ptr,
-                             "SprayBubbleParticleSettings",
-                             "Spray + Bubble Particles",
-                             "Spray + Bubble Particle System",
-                             (PART_MANTA_SPRAY | PART_MANTA_BUBBLE));
+    rna_Manta_parts_create(bmain,
+                           ptr,
+                           "SprayBubbleParticleSettings",
+                           "Spray + Bubble Particles",
+                           "Spray + Bubble Particle System",
+                           (PART_MANTA_SPRAY | PART_MANTA_BUBBLE));
 
     mmd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_SPRAY;
     mmd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_BUBBLE;
@@ -344,12 +344,12 @@ static void rna_Manta_combined_export_update(Main *bmain, Scene *scene, PointerR
     if (ob->type == OB_MESH && !rna_Manta_parts_exists(ptr, (PART_MANTA_FOAM | PART_MANTA_BUBBLE)))
 
       rna_Manta_parts_delete(ptr, (PART_MANTA_FOAM | PART_MANTA_BUBBLE));
-      rna_Manta_parts_create(bmain,
-                             ptr,
-                             "FoamBubbleParticleSettings",
-                             "Foam + Bubble Particles",
-                             "Foam + Bubble Particle System",
-                             (PART_MANTA_FOAM | PART_MANTA_BUBBLE));
+    rna_Manta_parts_create(bmain,
+                           ptr,
+                           "FoamBubbleParticleSettings",
+                           "Foam + Bubble Particles",
+                           "Foam + Bubble Particle System",
+                           (PART_MANTA_FOAM | PART_MANTA_BUBBLE));
 
     mmd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_FOAM;
     mmd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_BUBBLE;
@@ -365,12 +365,12 @@ static void rna_Manta_combined_export_update(Main *bmain, Scene *scene, PointerR
         !rna_Manta_parts_exists(ptr, (PART_MANTA_SPRAY | PART_MANTA_FOAM | PART_MANTA_BUBBLE)))
 
       rna_Manta_parts_delete(ptr, (PART_MANTA_SPRAY | PART_MANTA_FOAM | PART_MANTA_BUBBLE));
-      rna_Manta_parts_create(bmain,
-                             ptr,
-                             "SprayFoamBubbleParticleSettings",
-                             "Spray + Foam + Bubble Particles",
-                             "Spray + Foam + Bubble Particle System",
-                             (PART_MANTA_SPRAY | PART_MANTA_FOAM | PART_MANTA_BUBBLE));
+    rna_Manta_parts_create(bmain,
+                           ptr,
+                           "SprayFoamBubbleParticleSettings",
+                           "Spray + Foam + Bubble Particles",
+                           "Spray + Foam + Bubble Particle System",
+                           (PART_MANTA_SPRAY | PART_MANTA_FOAM | PART_MANTA_BUBBLE));
 
     mmd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_SPRAY;
     mmd->domain->particle_type |= FLUID_DOMAIN_PARTICLE_FOAM;



More information about the Bf-blender-cvs mailing list