[Bf-blender-cvs] [9ad80d9896e] master: Cleanup: remove last uses of WITH_SMOKE
Jacques Lucke
noreply at git.blender.org
Wed Sep 23 11:39:40 CEST 2020
Commit: 9ad80d9896ed2524c18a4c384cbb3fafbc601826
Author: Jacques Lucke
Date: Wed Sep 23 11:39:08 2020 +0200
Branches: master
https://developer.blender.org/rB9ad80d9896ed2524c18a4c384cbb3fafbc601826
Cleanup: remove last uses of WITH_SMOKE
===================================================================
M source/blender/blenkernel/intern/pointcache.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 31f5edf3d27..02b3d60afa5 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -73,11 +73,6 @@
# include "RBI_api.h"
#endif
-/* both in intern */
-#ifdef WITH_SMOKE
-# include "smoke_API.h"
-#endif
-
#ifdef WITH_OPENVDB
# include "openvdb_capi.h"
#endif
@@ -657,23 +652,6 @@ static void ptcache_cloth_error(void *cloth_v, const char *message)
BKE_modifier_set_error(&clmd->modifier, "%s", message);
}
-#ifdef WITH_SMOKE
-/* Smoke functions */
-static int ptcache_smoke_totpoint(void *smoke_v, int UNUSED(cfra))
-{
- FluidModifierData *fmd = (FluidModifierData *)smoke_v;
- FluidDomainSettings *fds = fmd->domain;
-
- if (fds->fluid) {
- return fds->base_res[0] * fds->base_res[1] * fds->base_res[2];
- }
- else {
- return 0;
- }
-}
-
-#endif
-
static int ptcache_dynamicpaint_totpoint(void *sd, int UNUSED(cfra))
{
DynamicPaintSurface *surface = (DynamicPaintSurface *)sd;
More information about the Bf-blender-cvs
mailing list