summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
index 3b7194c7..9c29ab64 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
@@ -936,6 +936,8 @@ void InspectorControlModel::setPropertyValue(long instance, int handle, const QV
// to both rejecting invalid and resetting the original value here.
const auto studio = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem();
EStudioObjectType theType = studio->GetClientDataModelBridge()->GetObjectType(instance);
+ qt3dsdm::AdditionalMetaDataType::Value additionalType
+ = studio->GetPropertySystem()->GetAdditionalMetaDataType(instance, handle);
if (theType == EStudioObjectType::OBJTYPE_CAMERA &&
studio->GetPropertySystem()->GetName(handle) == Q3DStudio::CString("scale")) {
@@ -946,7 +948,8 @@ void InspectorControlModel::setPropertyValue(long instance, int handle, const QV
if ((theType == EStudioObjectType::OBJTYPE_CUSTOMMATERIAL
|| theType == EStudioObjectType::OBJTYPE_EFFECT) &&
studio->GetPropertySystem()->GetDataType(handle)
- == qt3dsdm::DataModelDataType::String) {
+ == qt3dsdm::DataModelDataType::String
+ && additionalType == qt3dsdm::AdditionalMetaDataType::Texture) {
// force . at the beginning of the url
QString x = value.toString();
QUrl url(x);