Revision: 23096
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23096
Author: genscher
Date: 2009-09-10 01:52:48 +0200 (Thu, 10 Sep 2009)
Log Message:
-----------
Smoke:
* Bugfix for non-working high res display
* Bugfix for smoke disappearing on 2nd frame
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
Modified: branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
2009-09-09 23:11:43 UTC (rev 23095)
+++ branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
2009-09-09 23:52:48 UTC (rev 23096)
@@ -90,7 +90,10 @@
def poll(self, context):
md = context.smoke
- return md and (md.smoke_type == 'TYPE_DOMAIN')
+ if md:
+ return (md.smoke_type == 'TYPE_DOMAIN')
+
+ return False
def draw(self, context):
layout = self.layout
@@ -145,7 +148,7 @@
md = context.smoke.domain_settings
split = layout.split()
-
+
col = split.column()
col.itemL(text="Resolution:")
col.itemR(md, "amplify", text="Divisions")
@@ -154,7 +157,7 @@
col.itemL(text="Noise Method:")
col.row().itemR(md, "noise_type", text="")
col.itemR(md, "strength")
- sub.itemR(md, "viewhighres")
+ col.itemR(md, "viewhighres")
class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
__label__ = "Smoke High Resolution Cache"
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
2009-09-09 23:11:43 UTC (rev 23095)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
2009-09-09 23:52:48 UTC (rev 23096)
@@ -1847,7 +1847,7 @@
else if(pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
smokeModifier_reset(pid->calldata);
else if(pid->type == PTCACHE_TYPE_SMOKE_HIGHRES)
- smokeModifier_reset(pid->calldata);
+ smokeModifier_reset_turbulence(pid->calldata);
}
if(clear)
BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
2009-09-09 23:11:43 UTC (rev 23095)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
2009-09-09 23:52:48 UTC (rev 23096)
@@ -1157,14 +1157,13 @@
{
BKE_ptcache_id_reset(scene, &pid,
PTCACHE_RESET_OUTDATED);
}
- if(!(cache_wt->flag & PTCACHE_SIMULATION_VALID))
+ if(sds->wt && !(cache_wt->flag & PTCACHE_SIMULATION_VALID))
{
BKE_ptcache_id_reset(scene, &pid_wt,
PTCACHE_RESET_OUTDATED);
}
if(smd->time == -1 && framenr!= startframe)
return;
-
if(!smokeModifier_init(smd, ob, scene, dm))
return;
@@ -1287,6 +1286,7 @@
if(get_lamp(scene, light))
smoke_calc_transparency(sds->shadow,
smoke_get_density(sds->fluid), sds->p0, sds->p1, sds->res, sds->dx, light,
calc_voxel_transp, -7.0*sds->dx);
+ // printf("smd->time: %f\n", smd->time);
return;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
