Commit 1c5f776c authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Merge pull request #107 from Mervill/Unity3D

Unity3D compatibility (2).
parents a31a3d5a 67a2a115
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
/* /*
* This file is part of NLua. * This file is part of NLua.
* *
...@@ -58,13 +58,13 @@ namespace NLua ...@@ -58,13 +58,13 @@ namespace NLua
} }
public ObjectTranslator Find (LuaState luaState) public ObjectTranslator Find (LuaState luaState)
{ {
if (translators.ContainsKey (luaState)) if (translators.ContainsKey (luaState))
return translators [luaState]; return translators [luaState];
LuaState main = LuaCore.LuaNetGetMainState (luaState); LuaState main = LuaCore.LuaNetGetMainState (luaState);
if (translators.ContainsKey (main)) if (translators.ContainsKey (main))
return translators [main]; return translators [main];
return null; return null;
......
using System;
using System.Runtime.InteropServices;
#if UNITY_3D
namespace NLua {
/// <summary>
/// Disables CLS Compliance in Unity3D.
/// </summary>
[Serializable]
[AttributeUsage(AttributeTargets.All)]
[ComVisible(true)]
public class CLSCompliantAttribute : Attribute {
private bool _compliant;
public CLSCompliantAttribute(bool isCompliant) { _compliant = isCompliant; }
public bool IsCompliant { get { return _compliant; } }
}
}
#endif
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment