Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / gpu / intern / gpu_draw.c
index 75e8073..e7846a2 100644 (file)
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_smoke_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_view3d_types.h"
 
@@ -64,8 +62,6 @@
 #include "GPU_material.h"
 #include "GPU_draw.h"
 
-#include "smoke_API.h"
-
 /* These are some obscure rendering functions shared between the
  * game engine and the blender, in this module to avoid duplicaten
  * and abstract them away from the rest a bit */
@@ -748,31 +744,6 @@ int GPU_update_image_time(Image *ima, double time)
        return inc;
 }
 
-
-void GPU_free_smoke(SmokeModifierData *smd)
-{
-       if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain)
-       {
-               if(smd->domain->tex)
-                       GPU_texture_free(smd->domain->tex);
-               smd->domain->tex = NULL;
-
-               if(smd->domain->tex_shadow)
-                       GPU_texture_free(smd->domain->tex_shadow);
-               smd->domain->tex_shadow = NULL;
-       }
-}
-
-void GPU_create_smoke(SmokeModifierData *smd, int highres)
-{
-       if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && !smd->domain->tex && !highres)
-               smd->domain->tex = GPU_texture_create_3D(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2], smoke_get_density(smd->domain->fluid));
-       else if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain && !smd->domain->tex && highres)
-               smd->domain->tex = GPU_texture_create_3D(smd->domain->res_wt[0], smd->domain->res_wt[1], smd->domain->res_wt[2], smoke_turbulence_get_density(smd->domain->wt));
-
-       smd->domain->tex_shadow = GPU_texture_create_3D(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2], smd->domain->shadow);
-}
-
 void GPU_free_image(Image *ima)
 {
        /* free regular image binding */