From 6fb5885e9baaececd2d6f237c0eb2736a9933694 Mon Sep 17 00:00:00 2001 From: bjorn Date: Fri, 5 Nov 2021 18:47:03 -0700 Subject: [PATCH] Fix glb loading; --- src/modules/data/modelData_gltf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/data/modelData_gltf.c b/src/modules/data/modelData_gltf.c index 5ee72b28..5d5550c4 100644 --- a/src/modules/data/modelData_gltf.c +++ b/src/modules/data/modelData_gltf.c @@ -513,12 +513,14 @@ ModelData* lovrModelDataInitGltf(ModelData* model, Blob* source, ModelDataIO* io else { token += NOM_VALUE(json, token); } } + Blob* blob = model->blobs[buffer->blob]; + // If this is the glb binary data, increment the offset to account for the file header - if (buffer->data && buffer->data == source->data && glb) { + if (glb && blob == source) { buffer->offset += binOffset; } - buffer->data = (char*) model->blobs[buffer->blob]->data + buffer->offset; + buffer->data = (char*) blob->data + buffer->offset; } }