From fd54b9941dfb1c7678b4c1794016e3d41fa169df Mon Sep 17 00:00:00 2001
From: jianglong0156 <jianglong0156@gmail.com>
Date: Mon, 29 Jun 2015 16:34:54 +0800
Subject: [PATCH] resolve the titlemap testcase conflict with the 3d testcase.

---
 tests/js-tests/src/TileMapTest/TileMapTest.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/js-tests/src/TileMapTest/TileMapTest.js b/tests/js-tests/src/TileMapTest/TileMapTest.js
index 7cf21293dc..e1fbf215c8 100644
--- a/tests/js-tests/src/TileMapTest/TileMapTest.js
+++ b/tests/js-tests/src/TileMapTest/TileMapTest.js
@@ -229,7 +229,7 @@ var TMXOrthoTest2 = TileDemo.extend({
     },
     onExit:function () {
         this._super();
-        director.setProjection(cc.Director.PROJECTION_2D);
+        director.setProjection(cc.Director.PROJECTION_DEFAULT);
     },
 
     // Automation
@@ -1122,7 +1122,7 @@ var TMXIsoVertexZ = TMXFixBugLayer.extend({
     },
     onExit:function () {
         // At exit use any other projection.
-        //	director.setProjection:cc.Director.PROJECTION_3D);
+        director.setProjection(cc.Director.PROJECTION_DEFAULT);
         this._super();
     },
     repositionSprite:function (dt) {
@@ -1196,7 +1196,7 @@ var TMXOrthoVertexZ = TMXFixBugLayer.extend({
     },
     onExit:function () {
         // At exit use any other projection.
-        //	director.setProjection:cc.Director.PROJECTION_3D);
+        director.setProjection(cc.Director.PROJECTION_DEFAULT);
         this._super();
     },
     repositionSprite:function (dt) {
@@ -1673,6 +1673,11 @@ var TileMapTestScene = TestScene.extend({
         cc.director.setDepthTest(true);
 
         director.runScene(this);
+    },
+    onExit:function () {
+        cc.log("onExit");
+        cc.director.setDepthTest(false);
+        this._super();
     }
 });