Skip to content

Fix for 3dsMax Python #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix for 3dsMax Python #114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae50b8d
Fix for 3dsMax Python
dgsantana Dec 22, 2015
8dbc6d3
Removed dependency on C#6
dgsantana Jan 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions src/runtime/assemblymanager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using System.Collections;
using System.Collections.Specialized;
using System.Collections.Generic;
using System.Diagnostics;
using System.Reflection;
using System.Reflection.Emit;

Expand Down Expand Up @@ -57,10 +58,17 @@ internal static void Initialize() {
domain.AssemblyResolve += rhandler;

Assembly[] items = domain.GetAssemblies();
for (int i = 0; i < items.Length; i++) {
Assembly a = items[i];
assemblies.Add(a);
ScanAssembly(a);
foreach (var a in items)
{
try
{
ScanAssembly(a);
assemblies.Add(a);
}
catch (Exception ex)
{
Debug.WriteLine(string.Format("Error scanning assembly {0}. {1}", a, ex));
}
}
}

Expand Down Expand Up @@ -282,25 +290,23 @@ public static bool LoadImplicit(string name, bool warn=true) {
// be valid namespaces (to better match Python import semantics).
//===================================================================

static void ScanAssembly(Assembly assembly) {

static void ScanAssembly(Assembly assembly)
{
// A couple of things we want to do here: first, we want to
// gather a list of all of the namespaces contributed to by
// the assembly.

Type[] types = assembly.GetTypes();
for (int i = 0; i < types.Length; i++) {
Type t = types[i];
foreach (var t in types)
{
string ns = t.Namespace;
if ((ns != null) && (!namespaces.ContainsKey(ns))) {
string[] names = ns.Split('.');
string s = "";
for (int n = 0; n < names.Length; n++) {
s = (n == 0) ? names[0] : s + "." + names[n];
if (!namespaces.ContainsKey(s)) {
namespaces.Add(s,
new Dictionary<Assembly, string>()
);
namespaces.Add(s, new Dictionary<Assembly, string>());
}
}
}
Expand Down