From aa7cf15cc4beae812fd42a52f4b693f7527529cd Mon Sep 17 00:00:00 2001
From: Haroon Qureshi <haroonq@google.com>
Date: Tue, 11 Nov 2025 07:09:18 -0800
Subject: [PATCH] Set textures before assigning a material.

PiperOrigin-RevId: 830899288
Change-Id: I42029157e7be006d4dc18d0c84e27bf908af6f47
---
 src/experimental/filament/filament/drawable.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/experimental/filament/filament/drawable.cc b/src/experimental/filament/filament/drawable.cc
index 98e1eba3..64894106 100644
--- a/src/experimental/filament/filament/drawable.cc
+++ b/src/experimental/filament/filament/drawable.cc
@@ -300,6 +300,7 @@ void Drawable::UpdateMaterial(const mjvGeom& geom) {
     textures.metallic = object_mgr->GetTexture(geom.matid, mjTEXROLE_METALLIC);
     textures.roughness = object_mgr->GetTexture(geom.matid, mjTEXROLE_ROUGHNESS);
     textures.occlusion = object_mgr->GetTexture(geom.matid, mjTEXROLE_OCCLUSION);
+    material_.UpdateTextures(textures);
   }
 
   if (geom.type == mjGEOM_LINE || geom.type == mjGEOM_LINEBOX) {
@@ -356,10 +357,6 @@ void Drawable::UpdateMaterial(const mjvGeom& geom) {
     }
   }
 
-  if (geom.matid >= 0) {
-    material_.UpdateTextures(textures);
-  }
-
   Material::Params params;
   params.color = ReadFloat4(geom.rgba);
   params.emissive = geom.emission;