summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMäättä Antti <antti.maatta@qt.io>2018-02-09 08:19:15 +0200
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-02-09 06:42:23 +0000
commit40994f7b74fe75fc8abeafdee70b63257411824c (patch)
tree3474a44269a830274ebc7887913baf88822529b5
parent81a78215643cd60456669d35ae55c46bd387b922 (diff)
Add ./ at the beginning for effects too
Task-number: QT3DS-1011 Change-Id: Id37444b901ca739256ed2917883acdebc05de848 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
index c6dc9d08..053d53ba 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
@@ -917,7 +917,8 @@ void InspectorControlModel::setPropertyValue(long instance, int handle, const QV
if (theFloat3.x() == 0.0f || theFloat3.y() == 0.0f || theFloat3.z() == 0.0f )
v = oldValue;
}
- if (theType == EStudioObjectType::OBJTYPE_CUSTOMMATERIAL &&
+ if ((theType == EStudioObjectType::OBJTYPE_CUSTOMMATERIAL
+ || theType == EStudioObjectType::OBJTYPE_EFFECT) &&
studio->GetPropertySystem()->GetDataType(handle)
== qt3dsdm::DataModelDataType::String) {
// force . at the beginning of the url