[Bf-blender-cvs] [90413d600ef] fluid-mantaflow: fix for particle count in UI
Sebastián Barschkis
noreply at git.blender.org
Mon Oct 9 00:20:21 CEST 2017
Commit: 90413d600ef09d4103021a545d560460777fc8d8
Author: Sebastián Barschkis
Date: Mon Oct 9 00:00:00 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB90413d600ef09d4103021a545d560460777fc8d8
fix for particle count in UI
was missing count reset
===================================================================
M source/blender/blenkernel/intern/particle_system.c
M source/blender/makesrna/intern/rna_smoke.c
===================================================================
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index fa9617265b1..8b41e1acdcd 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3767,6 +3767,11 @@ static void particles_manta_step(ParticleSimulationData *sim, int UNUSED(cfra),
psys->particles = 0;
psys->totpart = 0;
}
+ if (psys->part) {
+ psys->part->totpart = 0;
+ psys->part->sta = 0;
+ psys->part->lifetime = 0;
+ }
/* manta sim particle import handling, actual loading of particles from file happens in FLUID helper. Here just pointer exchange */
#ifdef WITH_MANTA
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 653626b89a0..e3b67218d81 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -119,6 +119,7 @@ static void rna_Smoke_parts_create(PointerRNA *ptr, char *pset_name, char* parts
psys = MEM_callocN(sizeof(ParticleSystem), "particle_system");
part->type = psys_type;
+ part->totpart = 0;
psys->part = part;
psys->pointcache = BKE_ptcache_add(&psys->ptcaches);
BLI_strncpy(psys->name, parts_name, sizeof(psys->name));
More information about the Bf-blender-cvs
mailing list