[dali_1.0.11] Merge branch 'tizen'

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / public-api / controls / scrollable / item-view / grid-layout.cpp

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
index eb3bfd8..a2fef08 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 #include <algorithm>
 
@@ -622,7 +623,6 @@ void GridLayout::GetResizeAnimation(Animation& animation, Actor actor, Vector3 s
     // so that we can avoid the actors overlapping during orientation change.
     animation.Resize( actor, shrink, AlphaFunctions::EaseOut, 0.0f, durationSeconds * 0.5f );
     animation.Resize( actor, size, AlphaFunctions::EaseIn, 0.0f, durationSeconds );
-    animation.SetDestroyAction( Animation::Bake );
   }
 }