[Bf-blender-cvs] [91a2f5583e3] soc-2021-uv-editor-improvements: Fix compile error without `WITH_OCEANSIM` enabled
Julian Eisel
noreply at git.blender.org
Mon Aug 9 03:24:39 CEST 2021
Commit: 91a2f5583e3fd2292a3d0fe153dfafa6818cee32
Author: Julian Eisel
Date: Wed Aug 4 11:29:43 2021 +0200
Branches: soc-2021-uv-editor-improvements
https://developer.blender.org/rB91a2f5583e3fd2292a3d0fe153dfafa6818cee32
Fix compile error without `WITH_OCEANSIM` enabled
Was changed in 218df9941097.
===================================================================
M source/blender/blenkernel/intern/ocean.c
===================================================================
diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c
index 30e9213cdae..4d003ddc900 100644
--- a/source/blender/blenkernel/intern/ocean.c
+++ b/source/blender/blenkernel/intern/ocean.c
@@ -1639,7 +1639,7 @@ struct Ocean *BKE_ocean_add(void)
return oc;
}
-void BKE_ocean_init(struct Ocean *UNUSED(o),
+bool BKE_ocean_init(struct Ocean *UNUSED(o),
int UNUSED(M),
int UNUSED(N),
float UNUSED(Lx),
@@ -1662,6 +1662,7 @@ void BKE_ocean_init(struct Ocean *UNUSED(o),
short UNUSED(do_jacobian),
int UNUSED(seed))
{
+ return false;
}
void BKE_ocean_free_data(struct Ocean *UNUSED(oc))
More information about the Bf-blender-cvs
mailing list