summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2018-12-07 16:19:13 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-12-10 08:32:45 +0000
commitcf54ebd6f3591c09a7d3c1e5fdde9d8be163f02d (patch)
treeffc532db256018f7f09b141c330e15dca30b685b /src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h
parent69c3a54687eed3bca968aaba4efd87334df7304f (diff)
Fix undoing material type change doesn't update ref materials bugv2.2.0-rcv2.2.02.2
Also removed a previous hot fix (QT3DS-2768) and some cleanups in the undo/redo system. Task-number: QT3DS-2827 Change-Id: Id1bb8e89c4121dd3cf447bf29c1a0d02d034e247 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h')
-rw-r--r--src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h
index 400a26b4..3d62938f 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.h
@@ -120,6 +120,7 @@ private:
bool canOpenInInspector(int instance, int handle) const;
void openInInspector();
void onInstancePropertyValueChanged(qt3dsdm::Qt3DSDMPropertyHandle propertyHandle);
+ void onChildAdded(int inChild);
std::shared_ptr<qt3dsdm::ISignalConnection> m_selectionChangedConnection;
std::shared_ptr<qt3dsdm::ISignalConnection> m_timeChanged;
@@ -138,6 +139,7 @@ private:
QPointer<DataInputSelectView> m_dataInputChooserView;
std::vector<Q3DStudio::CFilePath> m_fileList;
MouseHelper m_mouseHelper;
+ std::vector<std::shared_ptr<qt3dsdm::ISignalConnection>> m_connections;
int m_instance;
int m_handle;