summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2018-10-12 14:47:08 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2018-10-15 12:20:01 +0000
commit72c46338714da6418fe65a2e6c532a2621cd6875 (patch)
tree6152b6bce3867d737aabdd324e811bbcea7e8dac /src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
parent9fe9cc9af651251b18d6cb932119f63636614393 (diff)
Drag and drop images to the timeline
- You can now drag images from the project palette to the timeline rows. Supported drop rows are layers, materials and images. - Relevant tweaks. Task-number: QT3DS-2267 Change-Id: I0646b47d31e38c89fe95461c7f2fb040a479b43e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp')
-rw-r--r--src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
index 153e2447..bf077a4e 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
@@ -430,7 +430,7 @@ QObject *InspectorControlView::showImageChooser(int handle, int instance, const
} else {
Q3DStudio::SCOPED_DOCUMENT_EDITOR(*g_StudioApp.GetCore()->GetDoc(),
QObject::tr("Set Property"))
- ->setInstanceImagePropertyValueAsRenderable(
+ ->setInstanceImagePropertyValue(
instance, handle, Q3DStudio::CString::fromQString(renderableId));
}
m_imageChooserView->hide();