feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Reset puppet if shader property changes

Browse Source 
Puppet reset is needed as changing shader makes no difference
if done after material initialization.

Change-Id: I67b0b4cca28b4636cc9acb1cd7446dfabc10e2ee
Fixes: QDS-3300
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-12-10 12:24:57 +02:00
parent d205778ec1
commit 66e491be14
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -465,6 +465,8 @@ void NodeInstanceView::propertiesAboutToBeRemoved(const QList<AbstractProperty>&
resetVerticalAnchors(property.parentModelNode()); resetVerticalAnchors(property.parentModelNode());
} else if (name == "anchors.baseline") { } else if (name == "anchors.baseline") {
resetVerticalAnchors(property.parentModelNode()); resetVerticalAnchors(property.parentModelNode());
} else if (name == "shader" && property.parentModelNode().isSubclassOf("QtQuick3D.Shader")) {
m_resetTimer.start();
} }
} }
@@ -513,6 +515,13 @@ void NodeInstanceView::variantPropertiesChanged(const QList<VariantProperty>& pr
QTC_ASSERT(m_nodeInstanceServer, return); QTC_ASSERT(m_nodeInstanceServer, return);
updatePosition(propertyList); updatePosition(propertyList);
m_nodeInstanceServer->changePropertyValues(createChangeValueCommand(propertyList)); m_nodeInstanceServer->changePropertyValues(createChangeValueCommand(propertyList));
for (const auto &property : propertyList) {
if (property.name() == "shader" && property.parentModelNode().isSubclassOf("QtQuick3D.Shader")) {
m_resetTimer.start();
break;
}
}
} }
/*! /*!
Notifies the view that the property parent of the model node \a node has Notifies the view that the property parent of the model node \a node has