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:
authorSebastián Barschkis <sebbas@sebbas.org>2020-01-29 13:58:01 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-01-29 21:21:52 +0300
commit745e356300585b036adb246fc80d3fcb2f23d83a (patch)
treeb0ee0953b4fb9b81681dc990f6ab2ebfde14897d /source/blender/blenkernel/intern/fluid.c
parent42318e358a888d49aeb44198bf5560614d0ca7b3 (diff)
Fluid: More cleanup related to flow emission maps
In addition to 4670c68e3dd9544fe14656dacdff641fcabcd540 which removed the unused high-res emission maps.
Diffstat (limited to 'source/blender/blenkernel/intern/fluid.c')
-rw-r--r--source/blender/blenkernel/intern/fluid.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index d9827ed9b57..18eac2789a2 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -1018,10 +1018,8 @@ static void update_obstacles(Depsgraph *depsgraph,
typedef struct EmissionMap {
float *influence;
- float *influence_high;
float *velocity;
float *distances;
- float *distances_high;
int min[3], max[3], res[3];
int hmin[3], hmax[3], hres[3];
int total_cells, valid;
@@ -1108,18 +1106,12 @@ static void em_freeData(EmissionMap *em)
if (em->influence) {
MEM_freeN(em->influence);
}
- if (em->influence_high) {
- MEM_freeN(em->influence_high);
- }
if (em->velocity) {
MEM_freeN(em->velocity);
}
if (em->distances) {
MEM_freeN(em->distances);
}
- if (em->distances_high) {
- MEM_freeN(em->distances_high);
- }
}
static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int additive, float sample_size)