diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-07-31 00:18:28 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-07-31 00:18:28 +0400 |
| commit | 0d45058867d39355b551931c0870f69a21bae8ae (patch) | |
| tree | 3b7132ace37ba2654cdeeb4a943dffe8cb69b9fd | |
| parent | dbba273371ff3e827f5b3cfc0aaf967222188611 (diff) | |
Smoke: compile error due to bad merged conflicts
| -rw-r--r-- | intern/smoke/extern/smoke_API.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/smoke/extern/smoke_API.h b/intern/smoke/extern/smoke_API.h index e5b2d3deab3..b7819d06edc 100644 --- a/intern/smoke/extern/smoke_API.h +++ b/intern/smoke/extern/smoke_API.h @@ -32,7 +32,7 @@ extern "C" { #endif -struct FLUID_3D *smoke_init(int *res, int amplify, float *p0, float dt); +struct FLUID_3D *smoke_init(int *res, int amplify, float *p0, float *p1, float dt); void smoke_free(struct FLUID_3D *fluid); void smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta); |