Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 16 insertions, 1 deletions

diff --git a/src/render/texture/apitexturemanager_p.h b/src/render/texture/apitexturemanager_p.h
index 2fd340e7e..91747b3bc 100644
--- a/src/render/texture/apitexturemanager_p.h
+++ b/src/render/texture/apitexturemanager_p.h
@@ -237,6 +237,21 @@ public:
         return true;
     }
 
+    // Change the texture data generator for given texture, if it is a non-shared texture
+    // Return true, if it was changed successfully, false otherwise
+    bool setGenerator(APITexture *tex, const QTextureGeneratorPtr &generator)
+    {
+        Q_ASSERT(tex);
+
+        if (isShared(tex))
+            return false;
+
+        tex->setGenerator(generator);
+        m_updatedTextures.push_back(tex);
+
+        return true;
+    }
+
     // Retrieves abandoned textures. This should be regularly called from the OpenGL thread
     // to make sure needed GL resources are de-allocated.
     QVector<APITexture*> takeAbandonedTextures()
@@ -258,7 +273,7 @@ public:
         if (impl->isUnique())
             return false;
 
-        auto it = m_sharedTextures.find(impl);
+        auto it = m_sharedTextures.constFind(impl);
         if (it == m_sharedTextures.cend())
             return false;