Revert "[3.0] Fixed Svace defect"

This reverts commit 0ff879e17e05d9117b3bfb3203de322a6fa66176.

Change-Id: Iad1ae64f0553bf1a19f90d0b08336770d3dba4d0

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index ed3669b..da3e0ba 100644 (file)
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -4007,7 +4007,6 @@ Vector2 Actor::ApplySizeSetPolicy( const Vector2 size )
           return size;
         }
       }
-      break;
     }
 
     default:

diff --git a/dali/internal/event/rendering/material-impl.cpp b/dali/internal/event/rendering/material-impl.cpp
index 1fcfb29..abac5a4 100644 (file)
--- a/dali/internal/event/rendering/material-impl.cpp
+++ b/dali/internal/event/rendering/material-impl.cpp
@@ -112,10 +112,7 @@ void Material::SetTextureImage( size_t index, Image* image )
       }
     }
 
-    if( image )
-    {
-      mTextures[index].mImage.Reset(image);
-    }
+    mTextures[index].mImage.Reset(image);
     SceneGraph::SetTextureImageMessage( GetEventThreadServices(), *mSceneObject, index, mTextures[index].mImage.Get()->GetResourceId() );
   }
 }