projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[3.0] Clipping API feature in Actor
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
nodes
/
scene-graph-layer.cpp
diff --git
a/dali/internal/update/nodes/scene-graph-layer.cpp
b/dali/internal/update/nodes/scene-graph-layer.cpp
index
8cf8155
..
573ccee
100644
(file)
--- a/
dali/internal/update/nodes/scene-graph-layer.cpp
+++ b/
dali/internal/update/nodes/scene-graph-layer.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-42,7
+42,7
@@
Layer::Layer()
mLastCamera( NULL ),
mBehavior( Dali::Layer::LAYER_2D ),
mIsClipping( false ),
mLastCamera( NULL ),
mBehavior( Dali::Layer::LAYER_2D ),
mIsClipping( false ),
- mDepthTestDisabled(
fals
e ),
+ mDepthTestDisabled(
tru
e ),
mIsDefaultSortFunction( true )
{
// layer starts off dirty
mIsDefaultSortFunction( true )
{
// layer starts off dirty
@@
-97,7
+97,13
@@
void Layer::SetDepthTestDisabled( bool disable )
bool Layer::IsDepthTestDisabled() const
{
bool Layer::IsDepthTestDisabled() const
{
- return ( mBehavior == Dali::Layer::LAYER_2D ) || mDepthTestDisabled;
+ return mDepthTestDisabled;
+}
+
+void Layer::ClearRenderables()
+{
+ colorRenderables.Clear();
+ overlayRenderables.Clear();
}
} // namespace SceneGraph
}
} // namespace SceneGraph