archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fluid Sim: Removed unused PointCache pointer

Browse Source 
The only uses were setting it to NULL and asserting it is NULL.
This commit is contained in:
Sybren A. Stüvel
2018-07-04 15:10:45 +02:00
parent 175fe29e58
commit d663ec48c0
3 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/makesdna/DNA_modifier_types.h
View File

@@ -815,7 +815,6 @@ typedef struct FluidsimModifierData {
ModifierData modifier; ModifierData modifier;
struct FluidsimSettings *fss; /* definition is in DNA_object_fluidsim_types.h */ struct FluidsimSettings *fss; /* definition is in DNA_object_fluidsim_types.h */
struct PointCache *point_cache; /* definition is in DNA_object_force_types.h */
} FluidsimModifierData; } FluidsimModifierData;
typedef struct ShrinkwrapModifierData { typedef struct ShrinkwrapModifierData {

5
source/blender/modifiers/intern/MOD_fluidsim.c
View File

@@ -76,11 +76,6 @@ static void copyData(const ModifierData *md, ModifierData *target, const int UNU
tfluidmd->fss->meshVelocities = MEM_dupallocN(tfluidmd->fss->meshVelocities); tfluidmd->fss->meshVelocities = MEM_dupallocN(tfluidmd->fss->meshVelocities);
} }
} }
/* Seems to never be used, but for sqke of consistency... */
BLI_assert(fluidmd->point_cache == NULL);
BLI_assert(tfluidmd->point_cache == NULL);
tfluidmd->point_cache = NULL;
} }

4
source/blender/modifiers/intern/MOD_fluidsim_util.c
View File

@@ -160,10 +160,6 @@ void fluidsim_free(FluidsimModifierData *fluidmd)
MEM_SAFE_FREE(fluidmd->fss); MEM_SAFE_FREE(fluidmd->fss);
} }
/* Seems to never be used, but for sqke of consistency... */
BLI_assert(fluidmd->point_cache == NULL);
fluidmd->point_cache = NULL;
return; return;
} }