Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development

1 files changed, 16 insertions, 21 deletions

diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index e04b6d5eee..10df4c8ee1 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2022&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2022, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -115,18 +115,6 @@ public:
     static const char* const GLTF_FILE_EXTENSION_TRANSFORM_ROTATION;
     static const LLUUID GLTF_OVERRIDE_NULL_UUID;
 
-    // *TODO: If/when we implement additional GLTF extensions, they may not be
-    // compatible with our GLTF terrain implementation. We may want to disallow
-    // materials with some features from being set on terrain, if their
-    // implementation on terrain is not compliant with the spec:
-    //     - KHR_materials_transmission: Probably OK?
-    //     - KHR_materials_ior: Probably OK?
-    //     - KHR_materials_volume: Likely incompatible, as our terrain
-    //       heightmaps cannot currently be described as finite enclosed
-    //       volumes.
-    // See also LLPanelRegionTerrainInfo::validateMaterials
-public:
-
     // get a UUID based on a hash of this LLGLTFMaterial
     LLUUID getHash() const;
 
@@ -195,7 +183,7 @@ public:
     void writeToModel(tinygltf::Model& model, S32 mat_index) const;
 
     virtual void applyOverride(const LLGLTFMaterial& override_mat);
-    
+
     // apply the given LLSD override data
     void applyOverrideLLSD(const LLSD& data);
 
@@ -249,10 +237,17 @@ protected:
     void updateLocalTexDataDigest();
 
 public:
+    // *TODO: If/when we implement additional GLTF extensions, they may not be
+    // compatible with our GLTF terrain implementation. We may want to disallow
+    // materials with some features from being set on terrain, if their
+    // implementation on terrain is not compliant with the spec:
+    //     - KHR_materials_transmission: Probably OK?
+    //     - KHR_materials_ior: Probably OK?
+    //     - KHR_materials_volume: Likely incompatible, as our terrain
+    //       heightmaps cannot currently be described as finite enclosed
+    //       volumes.
+    // See also LLPanelRegionTerrainInfo::validateMaterials
     // These fields are local to viewer and are a part of local bitmap support
-    // IMPORTANT: do not move this member down (and do not move
-    // mLocalTexDataDigest either): the getHash() method does rely on the
-    // current ordering. HB
     typedef std::map<LLUUID, LLUUID> local_tex_map_t;
     local_tex_map_t mTrackingIdToLocalTexture;
 
@@ -273,7 +268,7 @@ public:
     F32 mAlphaCutoff;
 
     AlphaMode mAlphaMode;
-    
+
     bool mDoubleSided = false;
 
     // Override specific flags for state that can't use off-by-epsilon or UUID