Commit: d9a530c55e869376aa2d0e9175a659d965d38d2a
Author: Julian Eisel
Date: Wed Aug 4 11:29:43 2021 +0200
Branches: master
https://developer.blender.org/rBd9a530c55e869376aa2d0e9175a659d965d38d2a
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))
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
