diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2022-11-14 14:40:24 -0800 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2022-11-14 14:57:22 -0800 |
| commit | e4dd9c1e648e38c15a1fa792ffeb5754ae936709 (patch) | |
| tree | 1b1b7e8d0e4fbf32acc6a585e32349eb6bbc7210 /indra/llprimitive/llgltfmaterial.h | |
| parent | cdf248d9860246fd0bee84f700642709fdebbe6e (diff) | |
SL-18634: Fix GLTF material texture transform not serializing when texture ID is null
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.h')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index 60116fd423..aa49a58f0c 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -56,6 +56,8 @@ public: F32 mRotation = 0.f; LLMatrix3 asMatrix(); + + bool operator==(const TextureTransform& other) const; }; enum AlphaMode @@ -149,14 +151,14 @@ public: static LLVector2 getDefaultTextureScale(); static F32 getDefaultTextureRotation(); - + static void hackOverrideUUID(LLUUID& id); static void applyOverrideUUID(LLUUID& dst_id, const LLUUID& override_id); // set mAlphaMode from string. // Anything otherthan "MASK" or "BLEND" sets mAlphaMode to ALPHA_MODE_OPAQUE void setAlphaMode(const std::string& mode, bool for_override = false); - + const char* getAlphaMode() const; // set the contents of this LLGLTFMaterial from the given json @@ -185,6 +187,6 @@ private: void setFromTexture(const tinygltf::Model& model, const T& texture_info, TextureInfo texture_info_id, LLUUID& texture_id_out); template<typename T> - void writeToTexture(tinygltf::Model& model, T& texture_info, TextureInfo texture_info_id, const LLUUID& texture_id, bool is_override, const LLUUID& base_texture_id) const; + void writeToTexture(tinygltf::Model& model, T& texture_info, TextureInfo texture_info_id, const LLUUID& texture_id) const; }; |