diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-12 02:12:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-12 02:12:30 +0400 |
commit | 3fdaf5cecc9c7c521c4db514f916f083b17881a6 (patch) | |
tree | fabdb833cab9ba68321fe9687abb5a44fd303798 /source/blender/blenkernel/BKE_fluidsim.h | |
parent | 139a0e7cb8a9003baa3d50d6d99d7f437b1d1899 (diff) |
[#14437] Modifier Stack Refactor
patch by Ben Batt (artificer)
Updated patch for 6 or so modifiers added since the patch was written.
- tested with CMake and SCons
- fixed one error were flags were being added to the fluids type.
- remove BKE_simple_deform.h, simple_deform.c, move functions into MOD_simpledeform.c since there were problems with circular deps.
- moved some fluid and boolean functions used by modifiers too.
Diffstat (limited to 'source/blender/blenkernel/BKE_fluidsim.h')
-rw-r--r-- | source/blender/blenkernel/BKE_fluidsim.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_fluidsim.h b/source/blender/blenkernel/BKE_fluidsim.h index d99e7b42cff..da43ae7f28b 100644 --- a/source/blender/blenkernel/BKE_fluidsim.h +++ b/source/blender/blenkernel/BKE_fluidsim.h @@ -30,6 +30,7 @@ #ifndef BKE_FLUIDSIM_H #define BKE_FLUIDSIM_H + struct Object; struct Scene; struct FluidsimModifierData; @@ -37,25 +38,12 @@ struct DerivedMesh; struct MVert; /* old interface */ -struct FluidsimSettings *fluidsimSettingsNew(struct Object *srcob); void initElbeemMesh(struct Scene *scene, struct Object *ob, int *numVertices, float **vertices, int *numTriangles, int **triangles, int useGlobalCoords, int modifierIndex); -/* new fluid-modifier interface */ -void fluidsim_init(struct FluidsimModifierData *fluidmd); -void fluidsim_free(struct FluidsimModifierData *fluidmd); - -struct DerivedMesh *fluidsim_read_cache(struct Object *ob, struct DerivedMesh *orgdm, - struct FluidsimModifierData *fluidmd, int framenr, int useRenderParams); -void fluidsim_read_vel_cache(struct FluidsimModifierData *fluidmd, struct DerivedMesh *dm, - char *filename); -struct DerivedMesh *fluidsimModifier_do(struct FluidsimModifierData *fluidmd, - struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, - int useRenderParams, int isFinalCalc); - /* bounding box & memory estimate */ void fluid_get_bb(struct MVert *mvert, int totvert, float obmat[][4], float start[3], float size[3]); |