diff options
-rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp index 701c06ab..166cc8f2 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp @@ -1762,9 +1762,11 @@ void InspectorControlModel::setPropertyValue(long instance, int handle, const QV if (!bridge->CheckNameUnique(parentInstance, instance, realNewName)) { QString origNewName = newName.toQString(); newName = bridge->GetUniqueChildName(parentInstance, instance, realNewName); - int slashIndex = newName.find('/'); - if (slashIndex != Q3DStudio::CString::ENDOFSTRING) - newName = newName.substr(slashIndex + 1); + if (bridge->isInsideMaterialContainer(instance)) { + int slashIndex = newName.rfind('/'); + if (slashIndex != Q3DStudio::CString::ENDOFSTRING) + newName = newName.substr(slashIndex + 1); + } // Display rename message box asynchronously so focus loss won't trigger setting // the name again g_StudioApp.GetDialogs()->DisplayObjectRenamed(origNewName, newName.toQString(), |