From 9585391311ce2138dda42e4aeabc1674c27f9aca Mon Sep 17 00:00:00 2001 From: Arthur Brainville Date: Mon, 8 Jan 2018 18:37:44 +0100 Subject: [PATCH] rename Color to ColorFactor Signed-off-by: Arthur Brainville (Ybalrid) --- tiny_gltf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiny_gltf.h b/tiny_gltf.h index 2accbd0..bf316c4 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -357,7 +357,7 @@ using ColorValue = std::array; ///Return the color of a material ///Returned value is only valid if the parameter represent a texture from a material - ColorValue Color() const { + ColorValue ColorFactor() const { return { { // this agregate intialize the std::array object, and uses C++11 RVO. number_array[0],