diff options
author | Janne Kangas <janne.kangas@qt.io> | 2018-02-07 14:14:36 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-02-23 13:26:55 +0000 |
commit | 4cc86c178ba35c7769f1019253441e3352a3e957 (patch) | |
tree | 1d9fed28bb88f259e962a27c199de56897c47c45 /src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | |
parent | 35dd440b809468b6705d2d34cec42fe0788cbc1c (diff) |
Remove old DataInput proto code
Reverts some (not all) changes in commits:
935d8a983db25978b3e8f0dbe67323684ce4dd96
e3c6e9d38a5b6f729093fc0349784fa475af8f62
337aaa465ac78ac72ca748f0c2d4c3b6257829b8
0707c13c34653066c89d5b25abe60a779650ee27
c1fc5d13e3668a117b4f8470ecb87b77b145efb8
Task-ID: QT3DS-865
Change-Id: I6f2ce77b12e2930aee1ea3b62b34aabe10bc6d00
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp')
-rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index 62d21463..e8bb3ba1 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -121,7 +121,6 @@ struct DataConstructor<SObjectRefType> #define QT3DS_WCHAR_T_ReferencedMaterial L"ReferencedMaterial" #define QT3DS_WCHAR_T_Alias L"Alias" #define QT3DS_WCHAR_T_Lightmaps L"Lightmaps" -#define QT3DS_WCHAR_T_DataInput L"DataInput" #define QT3DS_WCHAR_T_type L"type" #define QT3DS_WCHAR_T_id L"id" @@ -303,11 +302,6 @@ struct DataConstructor<SObjectRefType> #define QT3DS_WCHAR_T_lightmapindirect L"lightmapindirect" #define QT3DS_WCHAR_T_lightmapradiosity L"lightmapradiosity" #define QT3DS_WCHAR_T_lightmapshadow L"lightmapshadow" -#define QT3DS_WCHAR_T_value L"value" -#define QT3DS_WCHAR_T_valuestr L"valuestr" -#define QT3DS_WCHAR_T_timefrom L"timefrom" -#define QT3DS_WCHAR_T_timeto L"timeto" -#define QT3DS_WCHAR_T_controlledelemprop L"controlledelemprop" #define QT3DS_WCHAR_T_controlledproperty L"controlledproperty" const wchar_t *ComposerObjectTypes::Convert(ComposerObjectTypes::Enum inType) @@ -511,7 +505,6 @@ SComposerObjectDefinitions::SComposerObjectDefinitions( , m_Path(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_PathAnchorPoint(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_SubPath(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) - , m_DataInput(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) { } |