History

Merge remote-tracking branch 'upstream/master' into marge

Bradley Austin Davis committed 11 years ago

Commit fda1cb62 parents 5197367 9016f4373 files · +356 −457Browse files

Showing the changes to libraries/render-utils/src/TextureCache.cpp (1 of 73 files). Show all

Unified · Split

libraries/render-utils/src/TextureCache.cpp+1−1
@@ -608,7 +608,7 @@ DilatableNetworkTexture::DilatableNetworkTexture(const QUrl& url, const QByteArr · 607 unmodified lines
608608 QSharedPointer<Texture> DilatableNetworkTexture::getDilatedTexture(float dilation) {
609609 QSharedPointer<Texture> texture = _dilatedTextures.value(dilation);
610610 if (texture.isNull()) {
611− texture = QSharedPointer<Texture>(new Texture());
611+ texture = QSharedPointer<Texture>::create();
612612
613613 if (!_image.isNull()) {
614614 QImage dilatedImage = _image;

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