From 9046d04de41e274bfccfdef765e1557fec2dfd32 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Sat, 2 Sep 2023 12:45:58 -0700 Subject: [PATCH] Fix a crash in gltfio when not using ubershaders (#7135) --- NEW_RELEASE_NOTES.md | 1 + libs/gltfio/src/JitShaderProvider.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEW_RELEASE_NOTES.md b/NEW_RELEASE_NOTES.md index b2987e5c1b..1b657fc8a5 100644 --- a/NEW_RELEASE_NOTES.md +++ b/NEW_RELEASE_NOTES.md @@ -13,4 +13,5 @@ appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md). dark fringes to appear (recompile materials) - Allow glTF materials with transmission/volume extensions to choose their alpha mode instead of forcing `MASKED` +- Fix a crash in gltfio when not using ubershaders - Use flatmat for mat parameter in jsbinding diff --git a/libs/gltfio/src/JitShaderProvider.cpp b/libs/gltfio/src/JitShaderProvider.cpp index 8eeb06323f..7855d8b905 100644 --- a/libs/gltfio/src/JitShaderProvider.cpp +++ b/libs/gltfio/src/JitShaderProvider.cpp @@ -287,7 +287,7 @@ std::string shaderFromKey(const MaterialKey& config) { // TODO: Provided by Filament, but this should really be provided/computed by gltfio // TODO: This scale is per renderable and should include the scale of the mesh node - float scale = object_uniforms.userData; + float scale = getObjectUserData(); material.thickness = materialParams.volumeThicknessFactor * scale; )SHADER";