From c2c046f77e180a3c385601ed38f5a81a8bee8db5 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Fri, 11 Aug 2017 08:29:13 +0100
Subject: [PATCH] fixes on xcode

---
 engine/asset.cpp  | 3 ++-
 engine/asset.h    | 2 +-
 engine/canvas.cpp | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/engine/asset.cpp b/engine/asset.cpp
index fb6aa63..c40a6b1 100644
--- a/engine/asset.cpp
+++ b/engine/asset.cpp
@@ -45,11 +45,12 @@ std::vector<std::string> Asset::list_files(std::string folder, bool is_asset, co
 
     }
 #else
+    std::string abs_path = folder;
     if (is_asset)
     {
         NSString* bundle_path = [[NSBundle mainBundle] resourcePath];
         std::string base = [bundle_path cStringUsingEncoding : 1];
-        std::string abs_path = base + "/" + folder;
+        abs_path = base + "/" + folder;
     }
 
     DIR *dp;
diff --git a/engine/asset.h b/engine/asset.h
index 79a50ff..b1a0445 100644
--- a/engine/asset.h
+++ b/engine/asset.h
@@ -7,7 +7,7 @@ public:
     static AAssetManager* m_am;
     AAsset* m_asset = nullptr;
 #endif
-    static std::vector<std::string> Asset::list_files(std::string folder, bool is_asset, const std::string& filter_regex);
+    static std::vector<std::string> list_files(std::string folder, bool is_asset, const std::string& filter_regex);
 
     std::string m_current_path;
     FILE* m_fp = nullptr;
diff --git a/engine/canvas.cpp b/engine/canvas.cpp
index 3f12561..c0b4d82 100644
--- a/engine/canvas.cpp
+++ b/engine/canvas.cpp
@@ -667,6 +667,7 @@ void ui::Canvas::layer_merge(int source_idx, int dest_idx)
             ui::ShaderManager::u_int(kShaderUniform::Tex, 0); // dest
             ui::ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source
             ui::ShaderManager::u_float(kShaderUniform::Alpha, 1);
+            ShaderManager::u_int(kShaderUniform::Lock, false);
             ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));
 
             glActiveTexture(GL_TEXTURE0);