Merge pull request #801 from hartikainen:fix-mj_sizeModel

PiperOrigin-RevId: 522013801 Change-Id: Iff5e930fb7c86ae4296beb40f266ed02aabb6a7f
2023-04-05 04:20:11 -07:00
parent 55cc9d1e95 f91b760799
commit 9027b243b7
2 changed files with 47 additions and 2 deletions
@@ -803,8 +803,19 @@ void mj_deleteModel(mjModel* m) {

 // size of buffer needed to hold model
 int mj_sizeModel(const mjModel* m) {
-  return sizeof(int)*(4+getnint()) + sizeof(mjOption) +
-         sizeof(mjVisual) + sizeof(mjStatistic) + m->nbuffer;
+  int size = (
+    sizeof(int)*(4+getnint())
+    + sizeof(mjOption)
+    + sizeof(mjVisual)
+    + sizeof(mjStatistic));
+
+MJMODEL_POINTERS_PREAMBLE(m)
+#define X(type, name, nr, nc)         \
+  size += sizeof(type)*(m->nr)*(nc);
+  MJMODEL_POINTERS
+#undef X
+
+  return size;
 }