History

Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request

Leopoly_Phase1_003_Asset-Request

MiladNazeri committed 8 years ago

Commit 9baf02b2 parents 8e3097d e8f0df432 files · +2218 −334Browse files

Showing the changes to interface/src/scripting/AssetMappingsScriptingInterface.cpp (1 of 32 files). Show all

Unified · Split

interface/src/scripting/AssetMappingsScriptingInterface.cpp+2−2
@@ -260,7 +260,7 @@ void AssetMappingModel::refresh() { · 259 unmodified lines
260 for (auto& mapping : mappings) {260 for (auto& mapping : mappings) {
261 auto& path = mapping.first;261 auto& path = mapping.first;
262 262
263 if (path.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {263 if (path.startsWith(AssetUtils::HIDDEN_BAKED_CONTENT_FOLDER)) {
264 // Hide baked mappings264 // Hide baked mappings
265 continue;265 continue;
266 }266 }
@@ -303,7 +303,7 @@ void AssetMappingModel::refresh() { · 36 unmodified lines
303 auto statusString = isFolder ? "--" : bakingStatusToString(mapping.second.status);303 auto statusString = isFolder ? "--" : bakingStatusToString(mapping.second.status);
304 lastItem->setData(statusString, Qt::UserRole + 5);304 lastItem->setData(statusString, Qt::UserRole + 5);
305 lastItem->setData(mapping.second.bakingErrors, Qt::UserRole + 6);305 lastItem->setData(mapping.second.bakingErrors, Qt::UserRole + 6);
306 if (mapping.second.status == Pending) {306 if (mapping.second.status == AssetUtils::Pending) {
307 ++numPendingBakes;307 ++numPendingBakes;
308 }308 }
309 }309 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t