Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2009-08-23 17:15:10 +0400
committerMatt Ebb <matt@mke3.net>2009-08-23 17:15:10 +0400
commit971435f2a1332f897be00ce9ced3e7721d20994b (patch)
tree941cb18d88eb18413f7a8a99361d354549014863
parentf5711909a6ec1278968859cc903a13da7a157073 (diff)
* Compile fix after merge - disabled high-res smoke rendering in voxeldata texture. Will re-enable when the modifier situation has been worked out.
-rw-r--r--source/blender/render/intern/source/voxeldata.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 81fd1a408e1..ff076579788 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -166,11 +166,12 @@ void init_frame_smoke(Render *re, VoxelData *vd, Tex *tex)
SmokeModifierData *smd = (SmokeModifierData *)md;
if(smd->domain && smd->domain->fluid) {
- int big = (smd->domain->flags & MOD_SMOKE_HIGHRES);
+ //int big = (smd->domain->flags & MOD_SMOKE_HIGHRES);
+ int big=0;
if (big) {
- smoke_turbulence_get_res(smd->domain->wt, vd->resol);
- vd->dataset = smoke_turbulence_get_density(smd->domain->wt);
+ //smoke_turbulence_get_res(smd->domain->wt, vd->resol);
+ //vd->dataset = smoke_turbulence_get_density(smd->domain->wt);
} else {
VECCOPY(vd->resol, smd->domain->res);
vd->dataset = smoke_get_density(smd->domain->fluid);