Changeset 6067 for code/branches/particles2/src/orxonox/overlays/OrxonoxOverlay.h

Timestamp:

Nov 15, 2009, 1:44:25 PM (15 years ago)

Author:

rgrieder

Message:

Merged revisions 6054, 6056 and 6057 to particles2 branch.

Location:

code/branches/particles2

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)

code/branches/particles2/src/orxonox/overlays/OrxonoxOverlay.h

@@ -169 +169 @@
         virtual void changedOwner() {}
 
-        inline void setOverlayGroup(OverlayGroup* group)
-        {
-            if (group != this->group_)
-            {
-                this->group_ = group;
-                this->changedOverlayGroup();
-            }
-        }
+        void setOverlayGroup(OverlayGroup* group);
         inline OverlayGroup* getOverlayGroup() const
             { return this->group_; }