#3099: Fix PBR copy/paste not working

cosmic-linden · cosmic-linden · commit b635675131e9 · 2024-11-15T16:52:18.000-08:00
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
@@ -409,7 +409,7 @@ void LLGLTFMaterialList::flushUpdates(void(*done_callback)(bool))
     {
         callback_holder = std::make_shared<CallbackHolder>(done_callback);
     }
-    while (!sModifyQueue.empty() || !sApplyQueue.empty())
+    while (!sModifyQueue.empty() || !sApplyQueue.empty() || !sUpdates.isEmpty())
     {
         flushUpdatesOnce(callback_holder);
     }

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ void LLGLTFMaterialList::flushUpdates(void(*done_callback)(bool))`
`409`	`409`	`{`
`410`	`410`	`callback_holder = std::make_shared<CallbackHolder>(done_callback);`
`411`	`411`	`}`
`412`		`- while (!sModifyQueue.empty() \|\| !sApplyQueue.empty())`
	`412`	`+ while (!sModifyQueue.empty() \|\| !sApplyQueue.empty() \|\| !sUpdates.isEmpty())`
`413`	`413`	`{`
`414`	`414`	`flushUpdatesOnce(callback_holder);`
`415`	`415`	`}`