Merge branch '2.7'

Change-Id: I72499b82b0238c09486177f7c022f5d27896a2c8

1 files changed, 9 insertions, 0 deletions

diff --git a/src/runtimerender/graphobjects/Qt3DSRenderNode.h b/src/runtimerender/graphobjects/Qt3DSRenderNode.h
index ea0d481..7f5af1e 100644
--- a/src/runtimerender/graphobjects/Qt3DSRenderNode.h
+++ b/src/runtimerender/graphobjects/Qt3DSRenderNode.h
@@ -81,6 +81,7 @@ namespace render {
                                            ///mechanism.  This can be usefulf or caching purposes.
             IgnoreParentTransform = 1 << 13,
             LayerEnableDepthPrePass = 1 << 14, ///< True when we render a depth pass before
+            ForceLoad = 1 << 15,
         };
     };
 
@@ -178,6 +179,14 @@ namespace render {
         {
             ClearOrSet(value, NodeFlagValues::LayerEnableDepthPrePass);
         }
+        void SetForceLoad(bool value)
+        {
+            ClearOrSet(value, NodeFlagValues::ForceLoad);
+        }
+        bool IsForceLoad()
+        {
+            return this->operator&(NodeFlagValues::ForceLoad);
+        }
     };
 
     struct QT3DS_AUTOTEST_EXPORT SNode : public SGraphObject