[Bf-blender-cvs] [f5d5ffd] cycles_memory_experiments: Smoke: Fix compilation error with smoke disabled

Sergey Sharybin noreply at git.blender.org
Thu Apr 16 11:33:08 CEST 2015


Commit: f5d5ffd335a55138a428b0e2000962ddb48ae250
Author: Sergey Sharybin
Date:   Thu Apr 16 14:32:37 2015 +0500
Branches: cycles_memory_experiments
https://developer.blender.org/rBf5d5ffd335a55138a428b0e2000962ddb48ae250

Smoke: Fix compilation error with smoke disabled

===================================================================

M	source/blender/blenkernel/intern/smoke.c

===================================================================

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 41bf2e3..ad5f898 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -153,7 +153,7 @@ struct SmokeModifierData;
 #else /* WITH_SMOKE */
 
 /* Stubs to use when smoke is disabled */
-struct WTURBULENCE *smoke_turbulence_init(int *UNUSED(res), int UNUSED(amplify), int UNUSED(noisetype), const char *UNUSED(noisefile_path), int UNUSED(use_fire), int UNUSED(use_colors)) { return NULL; }
+struct WTURBULENCE *smoke_turbulence_init(int *UNUSED(res), int UNUSED(amplify), int UNUSED(noisetype), const char *UNUSED(noisefile_path), int UNUSED(use_fire), int UNUSED(use_colors), int UNUSED(use_sim)) { return NULL; }
 //struct FLUID_3D *smoke_init(int *UNUSED(res), float *UNUSED(dx), float *UNUSED(dtdef), int UNUSED(use_heat), int UNUSED(use_fire), int UNUSED(use_colors)) { return NULL; }
 void smoke_free(struct FLUID_3D *UNUSED(fluid)) {}
 float *smoke_get_density(struct FLUID_3D *UNUSED(fluid)) { return NULL; }




More information about the Bf-blender-cvs mailing list