diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2010-07-27 19:04:50 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2010-07-27 19:04:50 +0400 |
commit | 614192cce3aa8f43323977c44cfdcf649d9414fb (patch) | |
tree | b020ea1ffba548e885de580c8bc5f60e404df1dd | |
parent | 967d25ac1c269f28ab793f7c63edb9fd540dd5cf (diff) |
Fluid: Fix empty named fluid particle system; Smoke: Fix typo
-rw-r--r-- | release/scripts/ui/properties_physics_smoke.py | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_fluidsim.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py index ffc9caec979..9bae4c5b63f 100644 --- a/release/scripts/ui/properties_physics_smoke.py +++ b/release/scripts/ui/properties_physics_smoke.py @@ -103,7 +103,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel): col = split.column() col.prop(flow, "outflow") - col.label(text="Particle:") + col.label(text="Particle System:") col.prop_object(flow, "psys", ob, "particle_systems", text="") sub = col.column() diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index 3a763961420..3930c2ff3f7 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -105,6 +105,7 @@ static void rna_FluidSettings_update_type(Main *bmain, Scene *scene, PointerRNA psys->part= part; psys->pointcache= BKE_ptcache_add(&psys->ptcaches); psys->flag |= PSYS_ENABLED; + sprintf(psys->name, "FluidParticles"); BLI_addtail(&ob->particlesystem,psys); /* add modifier */ |