livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19080: Address clang-provided errors

meow-7.2.2
Cosmic Linden 2023-02-09 16:13:57 -08:00
parent d6841c0798
commit a56385345f
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llprimitive/llgltfmaterial.cpp
View File

@ -33,7 +33,7 @@
const char* LLGLTFMaterial::ASSET_VERSION = "1.1";
const char* LLGLTFMaterial::ASSET_TYPE = "GLTF 2.0";
const std::array<char*, 2> LLGLTFMaterial::ACCEPTED_ASSET_VERSIONS = { "1.0", "1.1" };
const std::array<std::string, 2> LLGLTFMaterial::ACCEPTED_ASSET_VERSIONS = { "1.0", "1.1" };
const char* GLTF_FILE_EXTENSION_TRANSFORM = "KHR_texture_transform";
const char* GLTF_FILE_EXTENSION_TRANSFORM_SCALE = "scale";

2
indra/llprimitive/llgltfmaterial.h
View File

@ -51,7 +51,7 @@ public:
static const char* ASSET_VERSION;
static const char* ASSET_TYPE;
static const std::array<char*, 2> ACCEPTED_ASSET_VERSIONS;
static const std::array<std::string, 2> ACCEPTED_ASSET_VERSIONS;
static bool isAcceptedVersion(const std::string& version) { return std::find(ACCEPTED_ASSET_VERSIONS.cbegin(), ACCEPTED_ASSET_VERSIONS.cend(), version) != ACCEPTED_ASSET_VERSIONS.cend(); }
struct TextureTransform

2
indra/llprimitive/tests/llgltfmaterial_test.cpp
View File

@ -23,8 +23,6 @@
* $/LicenseInfo$
*/
#pragma once
#include "linden_common.h"
#include "lltut.h"