summaryrefslogtreecommitdiffstats
path: root/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
diff options
context:
space:
mode:
authorJere Tuliniemi <jere.tuliniemi@qt.io>2018-04-26 12:00:17 +0300
committerJere Tuliniemi <jere.tuliniemi@qt.io>2018-04-30 08:49:15 +0000
commit5e3a87fbbf735d9d4f166ac3b65959a5a5097a1d (patch)
tree29b806c7a0d106a44cadfb6edd7dd5984612435a /src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
parentdabf59f1c69c9e7b5777f9fe819d46ffb4304614 (diff)
Add support for vertex colors
Adds a check mark for vertex color use to the default material in the inspector. Adds vertex color parsing to the FBX and Collada importer. Changes default material shaders to use vertex colors if enabled. Task-number: QT3DS-1507 Change-Id: Ide4a9f0da1c4dabe4e9b573e4cb0a2aecf714398 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h')
-rw-r--r--src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
index 82dd0d33..00727d53 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Include/Qt3DSRenderUIPSharedTranslation.h
@@ -381,6 +381,7 @@ namespace render {
#define ITERATE_QT3DS_RENDER_MATERIAL_PROPERTIES \
HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Material, Lighting, Dirty) \
HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Material, BlendMode, Dirty) \
+ HANDLE_QT3DS_RENDER_PROPERTY(Material, VertexColors, Dirty) \
HANDLE_QT3DS_RENDER_PROPERTY(MaterialBase, IblProbe, Dirty) \
HANDLE_QT3DS_RENDER_COLOR_VEC3_PROPERTY(Material, DiffuseColor, Dirty) \
HANDLE_QT3DS_RENDER_COLOR_PROPERTY(Material, DiffuseColor, Dirty) \