[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22721] branches/volume25/source/blender/ render/intern/source/voxeldata.c: * Compile fix after merge - disabled high-res smoke rendering in voxeldata texture .

[Matt Ebb]

Revision: 22721
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22721
Author:   broken
Date:     2009-08-23 15:15:10 +0200 (Sun, 23 Aug 2009)

Log Message:
-----------
* Compile fix after merge - disabled high-res smoke rendering in voxeldata 
texture. Will re-enable when the modifier situation has been worked out.

Modified Paths:
--------------
    branches/volume25/source/blender/render/intern/source/voxeldata.c

Modified: branches/volume25/source/blender/render/intern/source/voxeldata.c
===================================================================
--- branches/volume25/source/blender/render/intern/source/voxeldata.c   
2009-08-23 12:53:55 UTC (rev 22720)
+++ branches/volume25/source/blender/render/intern/source/voxeldata.c   
2009-08-23 13:15:10 UTC (rev 22721)
@@ -166,11 +166,12 @@
                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);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs