diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 00:38:08 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 00:47:06 +0300 |
commit | 79c3e8db26da63f5c2a88b2523f5ff5a24e3ae48 (patch) | |
tree | 52a2507563973541ba2c97e73c46e86d027bd6cb /source/blender/gpu | |
parent | 714e48ec55b6d787e2caa844eb9b1c14a45fc6da (diff) |
Fix linking errors WITH_MOD_FLUID=OFF
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 2ac202b8ddf..dca52355f10 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -940,12 +940,14 @@ void GPU_paint_update_image(Image *ima, ImageUser *iuser, int x, int y, int w, i /* *************************** Transfer functions *************************** */ +#ifdef WITH_FLUID + enum { TFUNC_FLAME_SPECTRUM = 0, TFUNC_COLOR_RAMP = 1, }; -#define TFUNC_WIDTH 256 +# define TFUNC_WIDTH 256 static void create_flame_spectrum_texture(float *data) { @@ -1160,6 +1162,8 @@ static GPUTexture *create_flame_texture(FluidDomainSettings *mds, int highres) return tex; } +#endif /* WITH_FLUID */ + void GPU_free_smoke(FluidModifierData *mmd) { if (mmd->type & MOD_FLUID_TYPE_DOMAIN && mmd->domain) { @@ -1197,6 +1201,9 @@ void GPU_free_smoke(FluidModifierData *mmd) void GPU_create_smoke_coba_field(FluidModifierData *mmd) { +#ifndef WITH_FLUID + UNUSED_VARS(mmd); +#else if (mmd->type & MOD_FLUID_TYPE_DOMAIN) { FluidDomainSettings *mds = mmd->domain; @@ -1207,10 +1214,14 @@ void GPU_create_smoke_coba_field(FluidModifierData *mmd) mds->tex_coba = create_transfer_function(TFUNC_COLOR_RAMP, mds->coba); } } +#endif } void GPU_create_smoke(FluidModifierData *mmd, int highres) { +#ifndef WITH_FLUID + UNUSED_VARS(mmd, highres); +#else if (mmd->type & MOD_FLUID_TYPE_DOMAIN) { FluidDomainSettings *mds = mmd->domain; @@ -1236,10 +1247,14 @@ void GPU_create_smoke(FluidModifierData *mmd, int highres) NULL); } } +#endif /* WITH_FLUID */ } void GPU_create_smoke_velocity(FluidModifierData *mmd) { +#ifndef WITH_FLUID + UNUSED_VARS(mmd); +#else if (mmd->type & MOD_FLUID_TYPE_DOMAIN) { FluidDomainSettings *mds = mmd->domain; @@ -1260,6 +1275,7 @@ void GPU_create_smoke_velocity(FluidModifierData *mmd) mds->res[0], mds->res[1], mds->res[2], GPU_R16F, vel_z, NULL); } } +#endif /* WITH_FLUID */ } /* TODO Unify with the other GPU_free_smoke. */ |