[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22071] branches/blender2.5/blender/intern /smoke/extern/smoke_API.h: Smoke: compile error due to bad merged conflicts

[Daniel Genrich]

Revision: 22071
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22071
Author:   genscher
Date:     2009-07-30 22:18:28 +0200 (Thu, 30 Jul 2009)

Log Message:
-----------
Smoke: compile error due to bad merged conflicts

Modified Paths:
--------------
    branches/blender2.5/blender/intern/smoke/extern/smoke_API.h

Modified: branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
===================================================================
--- branches/blender2.5/blender/intern/smoke/extern/smoke_API.h	2009-07-30 20:12:40 UTC (rev 22070)
+++ branches/blender2.5/blender/intern/smoke/extern/smoke_API.h	2009-07-30 20:18:28 UTC (rev 22071)
@@ -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);