Showing the changes to interface/src/scripting/AssetMappingsScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -13,6 +13,7 @@ · 12 unmodified lines | |||
| 13 | 13 | ||
| 14 | #include <QtScript/QScriptEngine> | 14 | #include <QtScript/QScriptEngine> |
| 15 | #include <QtCore/QFile> | 15 | #include <QtCore/QFile> |
| 16 | #include <QtCore/QThread> | ||
| 16 | 17 | ||
| 17 | #include <AssetRequest.h> | 18 | #include <AssetRequest.h> |
| 18 | #include <AssetUpload.h> | 19 | #include <AssetUpload.h> |
| @@ -20,6 +21,19 @@ · 1 unmodified line | |||
| 20 | #include <NetworkLogging.h> | 21 | #include <NetworkLogging.h> |
| 21 | #include <OffscreenUi.h> | 22 | #include <OffscreenUi.h> |
| 22 | 23 | ||
| 24 | void AssetMappingModel::clear() { | ||
| 25 | // make sure we are on the same thread before we touch the hash | ||
| 26 | if (thread() != QThread::currentThread()) { | ||
| 27 | QMetaObject::invokeMethod(this, "clear"); | ||
| 28 | return; | ||
| 29 | } | ||
| 30 | |||
| 31 | qDebug() << "Clearing loaded asset mappings for Asset Browser"; | ||
| 32 | |||
| 33 | _pathToItemMap.clear(); | ||
| 34 | QStandardItemModel::clear(); | ||
| 35 | } | ||
| 36 | |||
| 23 | AssetMappingsScriptingInterface::AssetMappingsScriptingInterface() { | 37 | AssetMappingsScriptingInterface::AssetMappingsScriptingInterface() { |
| 24 | _proxyModel.setSourceModel(&_assetMappingModel); | 38 | _proxyModel.setSourceModel(&_assetMappingModel); |
| 25 | _proxyModel.setSortRole(Qt::DisplayRole); | 39 | _proxyModel.setSortRole(Qt::DisplayRole); |