diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2010-08-01 16:16:32 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2010-08-01 16:16:32 +0400 |
commit | c34f831757e0985b7523b6e5bbfadd7dd6a2c161 (patch) | |
tree | 10c5e0fe5d05676d95c62e9bef4f35b8e565cd85 /source/blender | |
parent | 8fd1d8f02ab765038d798a4df33bbda821f8d7a0 (diff) |
Smoke:
- Bugfix for display problems in shaded view: Reverting to wire display mode for domain.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 2664a20bd18..15c7d3b4678 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -935,7 +935,6 @@ static void smoke_calc_domain(Scene *scene, Object *ob, SmokeModifierData *smd) // Add emitter density to temp emission map temp_emission_map[index] = sfs->density; - // Uses particle velocity as initial velocity for smoke if(sfs->flags & MOD_SMOKE_FLOW_INITVELOCITY && (psys->part->phystype != PART_PHYS_NO)) { @@ -943,8 +942,6 @@ static void smoke_calc_domain(Scene *scene, Object *ob, SmokeModifierData *smd) velocity_y[index] = pa->state.vel[1]*sfs->vel_multi; velocity_z[index] = pa->state.vel[2]*sfs->vel_multi; } - - } else if(sfs->type & MOD_SMOKE_FLOW_TYPE_OUTFLOW) // outflow { diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 4ace614640c..18b0f1ca61a 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -234,7 +234,7 @@ static void rna_Smoke_set_type(Main *bmain, Scene *scene, PointerRNA *ptr) switch (smd->type) { case MOD_SMOKE_TYPE_DOMAIN: - ob->dt = OB_BOUNDBOX; + ob->dt = OB_WIRE; break; case MOD_SMOKE_TYPE_FLOW: for(psys=ob->particlesystem.first; psys; psys=psys->next) |