[Bf-blender-cvs] [745e3563005] blender-v2.82-release: Fluid: More cleanup related to flow emission maps
Sebastián Barschkis
noreply at git.blender.org
Wed Jan 29 19:22:30 CET 2020
Commit: 745e356300585b036adb246fc80d3fcb2f23d83a
Author: Sebastián Barschkis
Date: Wed Jan 29 11:58:01 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB745e356300585b036adb246fc80d3fcb2f23d83a
Fluid: More cleanup related to flow emission maps
In addition to 4670c68e3dd9544fe14656dacdff641fcabcd540 which removed the unused high-res emission maps.
===================================================================
M source/blender/blenkernel/intern/fluid.c
===================================================================
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)
More information about the Bf-blender-cvs
mailing list