Page MenuHome
Paste P1594

(An Untitled Masterwork)
ActivePublic
Actions

Authored by Jacques Lucke (JacquesLucke) on Aug 19 2020, 6:37 PM.
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index b3da6c53b34..93140ed1ea2 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -4262,7 +4262,7 @@ float psys_get_child_time(
*dietime = time + life;
}
- return (cfra - time) / life;
+ return (cfra - time) / life; /* HERE */
}
float psys_get_child_size(ParticleSystem *psys,
ChildParticle *cpa,
@@ -4691,7 +4691,7 @@ int psys_get_particle_state(ParticleSimulationData *sim, int p, ParticleKey *sta
if (cpa) {
float mat[4][4];
ParticleKey *key1;
- float t = (cfra - pa->time) / pa->lifetime;
+ float t = (cfra - pa->time) / pa->lifetime; /* HERE */
const float par_orco[3] = {0.0f, 0.0f, 0.0f};
key1 = &pa->state;
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 7bfc0ca764f..f3ab72910ca 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2307,7 +2307,7 @@ static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, floa
// copy_v3_v3(pa->state.ave, states->ave);
/* finally we do guides */
- time = (cfra - pa->time) / pa->lifetime;
+ time = (cfra - pa->time) / pa->lifetime; /* HERE */
CLAMP(time, 0.0f, 1.0f);
copy_v3_v3(tkey.co, pa->state.co);
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 3067a5a9453..7266647c6d5 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -2810,7 +2810,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Particle_reset");
prop = RNA_def_property(srna, "lifetime", PROP_FLOAT, PROP_TIME);
- RNA_def_property_range(prop, 1.0f, MAXFRAMEF);
+ RNA_def_property_range(prop, 0.0f, MAXFRAMEF);
RNA_def_property_ui_text(prop, "Lifetime", "Life span of the particles");
RNA_def_property_update(prop, 0, "rna_Particle_reset");
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index d520cccf0a2..28f939b822b 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -1094,7 +1094,7 @@ static Mesh *explodeMesh(ExplodeModifierData *emd,
/* override uv channel for particle age */
if (mtface) {
- float age = (pa != NULL) ? (cfra - pa->time) / pa->lifetime : 0.0f;
+ float age = (pa != NULL) ? (cfra - pa->time) / pa->lifetime : 0.0f; /* HERE */
/* Clamp to this range to avoid flipping to the other side of the coordinates. */
CLAMP(age, 0.001f, 0.999f);
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 12b80da9f59..60303ba44d8 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -236,7 +236,7 @@ static void pointdensity_cache_psys(
if (data_used & POINT_DATA_LIFE) {
if (i < psys->totpart) {
- state.time = (cfra - pa->time) / pa->lifetime;
+ state.time = (cfra - pa->time) / pa->lifetime; /* HERE */
}
else {
ChildParticle *cpa = (psys->child + i) - psys->totpart;