History

Fix Model setURL with delayload

Without this condition the model stays in a state where the geometry is downloaded but not referenced That way, another call to setURL with update the geometry reference instead of returning.

Atlante45 committed 11 years ago

Commit 4911aa51 parent 90c47a61 file · +1 −1Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 1 file). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+1−1
@@ -1047,7 +1047,7 @@ int Model::getLastFreeJointIndex(int jointIndex) const { · 1046 unmodified lines
1047 1047
1048void Model::setURL(const QUrl& url, const QUrl& fallback, bool retainCurrent, bool delayLoad) {1048void Model::setURL(const QUrl& url, const QUrl& fallback, bool retainCurrent, bool delayLoad) {
1049 // don't recreate the geometry if it's the same URL1049 // don't recreate the geometry if it's the same URL
1050 if (_url == url) {1050 if (_url == url && _geometry && _geometry->getURL() == url) {
1051 return;1051 return;
1052 }1052 }
1053 _url = url;1053 _url = url;

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