rename

oxygine/src/oxygine/PostProcess.cpp

@@ -452,7 +452,7 @@ namespace oxygine
         }
 
         //OX_ASSERT(0);
-        RenderDelegate* rd = actor->getMaterial();
+        RenderDelegate* rd = actor->getRenderDelegate();
         actor->setRenderDelegate(STDRenderDelegate::instance);
         STDRenderDelegate::instance->RenderDelegate::render(actor, rs);
 
@@ -475,7 +475,7 @@ namespace oxygine
     {
 
         removePostProcessItem(this);
-        if (_actor && _actor->getMaterial())
+        if (_actor && _actor->getRenderDelegate())
             _actor->setRenderDelegate(_prevMaterial);
     }
 
@@ -502,7 +502,7 @@ namespace oxygine
     void TweenPostProcess::init(Actor& actor)
     {
         _actor = &actor;
-        _prevMaterial = _actor->getMaterial();
+        _prevMaterial = _actor->getRenderDelegate();
         _actor->setRenderDelegate(this);
     }
 
@@ -514,7 +514,7 @@ namespace oxygine
 
     void TweenPostProcess::done(Actor& actor)
     {
-        if (_actor->getMaterial())
+        if (_actor->getRenderDelegate())
             _actor->setRenderDelegate(_prevMaterial);
     }
 

oxygine/src/oxygine/actor/Actor.h

@@ -114,7 +114,7 @@ namespace oxygine
         bool                getTouchEnabled() const { return (_flags & flag_touchEnabled) != 0; }
         bool                getTouchChildrenEnabled() const { return (_flags & flag_touchChildrenEnabled) != 0; }
         UpdateCallback      getCallbackDoUpdate() const {return _cbDoUpdate;}
-        RenderDelegate*     getMaterial() { return _rdelegate; }
+        RenderDelegate*     getRenderDelegate() { return _rdelegate; }
         //RenderCallback        getCallbackDoRender() const {return _cbDoRender;}
 
         /**return local actor transformation*/