Revision: 42022
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42022
Author: psy-fi
Date: 2011-11-20 17:12:07 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Fix different declaration and implementation of function names
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/ocean.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/ocean.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/ocean.c
2011-11-20 17:09:54 UTC (rev 42021)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/ocean.c
2011-11-20 17:12:07 UTC (rev 42022)
@@ -1404,7 +1404,7 @@
{
}
-struct OceanCache *BKE_init_ocean_cache(char *UNUSED(bakepath), int
UNUSED(start), int UNUSED(end), float UNUSED(wave_scale),
+struct OceanCache *BKE_init_ocean_cache(const char *UNUSED(bakepath), const
char *UNUSED(relbase), int UNUSED(start), int UNUSED(end), float
UNUSED(wave_scale),
float UNUSED(chop_amount),
float UNUSED(foam_coverage), float UNUSED(foam_fade), int UNUSED(resolution))
{
OceanCache *och = MEM_callocN(sizeof(OceanCache), "ocean cache data");
@@ -1412,7 +1412,7 @@
return och;
}
-void BKE_simulate_ocean_cache(struct OceanCache *UNUSED(och), const char
*UNUSED(relbase), int UNUSED(frame))
+void BKE_simulate_ocean_cache(struct OceanCache *UNUSED(och), int
UNUSED(frame))
{
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs