Commit: d663ec48c06a083de74e90dd9c605e98b28baa37
Author: Sybren A. Stüvel
Date: Wed Jul 4 15:10:45 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd663ec48c06a083de74e90dd9c605e98b28baa37
Fluid Sim: Removed unused PointCache pointer
The only uses were setting it to NULL and asserting it is NULL.
===================================================================
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/modifiers/intern/MOD_fluidsim.c
M source/blender/modifiers/intern/MOD_fluidsim_util.c
===================================================================
diff --git a/source/blender/makesdna/DNA_modifier_types.h
b/source/blender/makesdna/DNA_modifier_types.h
index 49d72eddd09..42b22e45495 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -815,7 +815,6 @@ typedef struct FluidsimModifierData {
ModifierData modifier;
struct FluidsimSettings *fss; /* definition is in
DNA_object_fluidsim_types.h */
- struct PointCache *point_cache; /* definition is in
DNA_object_force_types.h */
} FluidsimModifierData;
typedef struct ShrinkwrapModifierData {
diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c
b/source/blender/modifiers/intern/MOD_fluidsim.c
index 272cc5c17f4..6e322dc7016 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim.c
@@ -76,11 +76,6 @@ static void copyData(const ModifierData *md, ModifierData
*target, const int UNU
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;
}
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c
b/source/blender/modifiers/intern/MOD_fluidsim_util.c
index cea9e69526c..ed5d08a95d4 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -160,10 +160,6 @@ void fluidsim_free(FluidsimModifierData *fluidmd)
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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
