diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-07-28 10:30:51 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-07-28 10:30:51 -0500 |
| commit | 8c4fcd76ba9b25f10242682b0169a1b20bc27b86 (patch) | |
| tree | fe88a247becbef8b80f4a6adf6c0827c30001764 /indra/newview/llpanelface.h | |
| parent | ff4477397b443fae59a4d7b98b2b894eb1dc77e0 (diff) | |
| parent | 2e591ffbd581ba2a51c8eccb2b975452c4c31fe3 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rw-r--r-- | indra/newview/llpanelface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 4dfef5d9bc..7d567c7ce8 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -452,7 +452,7 @@ private: void onTextureSelectionChanged(LLInventoryItem* itemp); void onPbrSelectionChanged(LLInventoryItem* itemp); - void updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool force_set_values); + void updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool& has_faces_without_pbr, bool force_set_values); void updateVisibilityGLTF(); void updateSelectedGLTFMaterials(std::function<void(LLGLTFMaterial*)> func); @@ -595,7 +595,7 @@ public: static void getFace(class LLFace*& face_to_return, bool& identical_face); static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face); static void getTexId(LLUUID& id, bool& identical); - static void getPbrMaterialId(LLUUID& id, bool& identical); + static void getPbrMaterialId(LLUUID& id, bool& identical, bool& has_pbr, bool& has_faces_without_pbr); static void getObjectScaleS(F32& scale_s, bool& identical); static void getObjectScaleT(F32& scale_t, bool& identical); static void getMaxDiffuseRepeats(F32& repeats, bool& identical); |