Rename mesh_assetpathadr to mesh_pathadr and move it to the end of the mesh section.

PiperOrigin-RevId: 568911603
Change-Id: I8f21c3d1cc9c73b6a95292a50f262b1a199d0898
This commit is contained in:
Saran Tunyasuvunakool
2023-09-27 11:31:26 -07:00
committed by Copybara-Service
parent 0dfeedb320
commit 8ed321d469
9 changed files with 19 additions and 19 deletions
+1 -1
View File
@@ -1867,7 +1867,7 @@ const char* mj_validateReferences(const mjModel* m) {
X(name_textadr, ntext, nnames , 0 ) \
X(name_tupleadr, ntuple, nnames , 0 ) \
X(name_keyadr, nkey, nnames , 0 ) \
X(mesh_assetpathadr, nmesh, npaths , 0 )
X(mesh_pathadr, nmesh, npaths , 0 )
#define X(adrarray, nadrs, ntarget, numarray) { \
int *nums = (numarray); \
+2 -2
View File
@@ -1332,10 +1332,10 @@ void mjCModel::CopyPaths(mjModel* m) {
for (unsigned int i=0; i<meshes.size(); i++) {
if (meshes[i]->file().empty()) {
m->mesh_assetpathadr[i] = -1;
m->mesh_pathadr[i] = -1;
continue;
}
m->mesh_assetpathadr[i] = adr;
m->mesh_pathadr[i] = adr;
// copy path
size_t path_size = meshes[i]->file().size();