From 871fd30622194e46e0c6549038b4e2506a1b2bf2 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 15 Nov 2016 11:40:32 +0900 Subject: [PATCH] Revert "[3.0] Removed 3D layer dependency of Model3dView and Mesh Visual." This reverts commit 594db763655ff2621cec632d1e3d9be242e294cc. Change-Id: I68c84cb1baf405df969feef0c5d25b1c55b2aae1 --- dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp | 1 - dali-toolkit/internal/visuals/mesh/mesh-visual.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp index d451976..38e7d3e 100644 --- a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp +++ b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp @@ -536,7 +536,6 @@ void Model3dView::CreateGeometry() { mRenderer.SetGeometry( mMesh ); mRenderer.SetProperty( Renderer::Property::DEPTH_WRITE_MODE, DepthWriteMode::ON ); - mRenderer.SetProperty( Renderer::Property::DEPTH_TEST_MODE, DepthTestMode::ON ); } } } diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp index af8c30d..597de7b 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp @@ -437,7 +437,6 @@ void MeshVisual::InitializeRenderer() mImpl->mRenderer = Renderer::New( mGeometry, mShader ); mImpl->mRenderer.SetTextures( mTextureSet ); mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_WRITE_MODE, DepthWriteMode::ON ); - mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_TEST_MODE, DepthTestMode::ON ); } void MeshVisual::SupplyEmptyGeometry() -- 2.7.4