summaryrefslogtreecommitdiff
path: root/indra/newview/lltinygltfhelper.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-12-01 21:54:49 +0200
committerakleshchev <117672381+akleshchev@users.noreply.github.com>2022-12-02 10:24:23 +0200
commit321c7895d00b0b88675c06b8f1cef063632fd686 (patch)
treec78231946ad099b8ca4bacc5007993cd97268a4e /indra/newview/lltinygltfhelper.h
parentc0f598c10376f12310660a729f4a763dbf46368e (diff)
SL-18741 Basic bulk upload for gltf materials #1
Diffstat (limited to 'indra/newview/lltinygltfhelper.h')
-rw-r--r--indra/newview/lltinygltfhelper.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltinygltfhelper.h b/indra/newview/lltinygltfhelper.h
index 250a4b0b9a..92c9876aff 100644
--- a/indra/newview/lltinygltfhelper.h
+++ b/indra/newview/lltinygltfhelper.h
@@ -43,10 +43,12 @@ namespace LLTinyGLTFHelper
LLImageRaw* getTexture(const std::string& folder, const tinygltf::Model& model, S32 texture_index);
+ S32 getMaterialCountFromFile(const std::string& filename);
+
bool getMaterialFromFile(
const std::string& filename,
S32 mat_index,
- LLPointer < LLFetchedGLTFMaterial> material,
+ LLFetchedGLTFMaterial* material,
std::string& material_name);
void initFetchedTextures(tinygltf::Material& material,