Bug fix which makes applications crash when adding a renderer to an on stage actor

[platform/core/uifw/dali-core.git] / dali / public-api / actors / renderable-actor.cpp

diff --git a/dali/public-api/actors/renderable-actor.cpp b/dali/public-api/actors/renderable-actor.cpp
index 11ad014..f35decb 100644 (file)
--- a/dali/public-api/actors/renderable-actor.cpp
+++ b/dali/public-api/actors/renderable-actor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/actors/renderable-actor-impl.h>
+#include <dali/internal/event/effects/shader-effect-impl.h>
 
 namespace Dali
 {
@@ -39,81 +40,22 @@ RenderableActor::~RenderableActor()
 {
 }
 
-void RenderableActor::SetSortModifier(float modifier)
+RenderableActor::RenderableActor(const RenderableActor& copy)
+: Actor(copy)
 {
-  GetImplementation(*this).SetSortModifier(modifier);
 }
 
-float RenderableActor::GetSortModifier() const
+RenderableActor& RenderableActor::operator=(const RenderableActor& rhs)
 {
-  return GetImplementation(*this).GetSortModifier();
+  BaseHandle::operator=(rhs);
+  return *this;
 }
 
-void RenderableActor::SetCullFace(const CullFaceMode mode)
-{
-  GetImplementation(*this).SetCullFace(mode);
-}
-
-CullFaceMode RenderableActor::GetCullFace() const
-{
-  return GetImplementation(*this).GetCullFace();
-}
-
-void RenderableActor::SetBlendMode( BlendingMode::Type mode )
-{
-  GetImplementation(*this).SetBlendMode( mode );
-}
-
-BlendingMode::Type RenderableActor::GetBlendMode() const
-{
-  return GetImplementation(*this).GetBlendMode();
-}
-
-void RenderableActor::SetBlendFunc( BlendingFactor::Type srcFactorRgba, BlendingFactor::Type destFactorRgba )
-{
-  GetImplementation(*this).SetBlendFunc( srcFactorRgba, destFactorRgba );
-}
-
-void RenderableActor::SetBlendFunc( BlendingFactor::Type srcFactorRgb,   BlendingFactor::Type destFactorRgb,
-                                    BlendingFactor::Type srcFactorAlpha, BlendingFactor::Type destFactorAlpha )
-{
-  GetImplementation(*this).SetBlendFunc( srcFactorRgb, destFactorRgb, srcFactorAlpha, destFactorAlpha );
-}
-
-void RenderableActor::GetBlendFunc( BlendingFactor::Type& srcFactorRgb,   BlendingFactor::Type& destFactorRgb,
-                                    BlendingFactor::Type& srcFactorAlpha, BlendingFactor::Type& destFactorAlpha ) const
-{
-  GetImplementation(*this).GetBlendFunc( srcFactorRgb, destFactorRgb, srcFactorAlpha, destFactorAlpha );
-}
-
-void RenderableActor::SetBlendEquation( BlendingEquation::Type equationRgba )
-{
-  GetImplementation(*this).SetBlendEquation( equationRgba );
-}
-
-void RenderableActor::SetBlendEquation( BlendingEquation::Type equationRgb, BlendingEquation::Type equationAlpha )
-{
-  GetImplementation(*this).SetBlendEquation( equationRgb, equationAlpha );
-}
-
-void RenderableActor::GetBlendEquation( BlendingEquation::Type& equationRgb, BlendingEquation::Type& equationAlpha ) const
-{
-  GetImplementation(*this).GetBlendEquation( equationRgb, equationAlpha );
-}
-
-void RenderableActor::SetBlendColor( const Vector4& color )
-{
-  GetImplementation(*this).SetBlendColor( color );
-}
-
-const Vector4& RenderableActor::GetBlendColor() const
-{
-  return GetImplementation(*this).GetBlendColor();
-}
 
 RenderableActor::RenderableActor(Internal::RenderableActor* internal)
 : Actor(internal)
 {
 }
 
+
 } // namespace Dali