summaryrefslogtreecommitdiffstats
path: root/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
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/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
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/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp')
-rw-r--r--src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
index d0b8d9e2..289152db 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
@@ -157,6 +157,7 @@ struct DataConstructor<SObjectRefType>
#define QT3DS_WCHAR_T_iblprobe L"iblprobe"
#define QT3DS_WCHAR_T_shaderlighting L"shaderlighting"
#define QT3DS_WCHAR_T_blendmode L"blendmode"
+#define QT3DS_WCHAR_T_vertexcolors L"vertexcolors"
#define QT3DS_WCHAR_T_diffuse L"diffuse"
#define QT3DS_WCHAR_T_diffusemap L"diffusemap"
#define QT3DS_WCHAR_T_diffusemap2 L"diffusemap2"