use imp.reload() rather then reload().

5 files changed, 18 insertions, 17 deletions

diff --git a/rigify/__init__.py b/rigify/__init__.py
index 2db7c808..8565a67d 100644
--- a/rigify/__init__.py
+++ b/rigify/__init__.py
@@ -28,12 +28,13 @@ bl_addon_info = {
     "category": "Rigging"}
 
 if "bpy" in locals():
-    reload(generate)
-    reload(ui)
-    reload(utils)
-    reload(metarig_menu)
+    import imp
+    imp.reload(generate)
+    imp.reload(ui)
+    imp.reload(utils)
+    imp.reload(metarig_menu)
 else:
-    from rigify import generate, ui, utils, metarig_menu
+    from . import generate, ui, utils, metarig_menu
 
 import bpy
 import bpy_types
diff --git a/rigify/rigs/biped/arm/__init__.py b/rigify/rigs/biped/arm/__init__.py
index 4198345b..13d9e430 100644
--- a/rigify/rigs/biped/arm/__init__.py
+++ b/rigify/rigs/biped/arm/__init__.py
@@ -17,13 +17,13 @@
 #======================= END GPL LICENSE BLOCK ========================
 
 import bpy
-from imp import reload
+import imp
 from . import fk, ik, deform
 from rigify.utils import MetarigError, get_layers
 
-reload(fk)
-reload(ik)
-reload(deform)
+imp.reload(fk)
+imp.reload(ik)
+imp.reload(deform)
 
 script = """
 fk_arm = ["%s", "%s", "%s"]
diff --git a/rigify/rigs/biped/leg/__init__.py b/rigify/rigs/biped/leg/__init__.py
index ac8913f5..5cbf3b11 100644
--- a/rigify/rigs/biped/leg/__init__.py
+++ b/rigify/rigs/biped/leg/__init__.py
@@ -17,13 +17,13 @@
 #======================= END GPL LICENSE BLOCK ========================
 
 import bpy
-from imp import reload
+import imp
 from . import fk, ik, deform
 from rigify.utils import MetarigError, get_layers
 
-reload(fk)
-reload(ik)
-reload(deform)
+imp.reload(fk)
+imp.reload(ik)
+imp.reload(deform)
 
 script = """
 fk_leg = ["%s", "%s", "%s"]
diff --git a/rigify/ui.py b/rigify/ui.py
index a7267c62..5af4122b 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -18,7 +18,6 @@
 
 import bpy
 from bpy.props import *
-from imp import reload
 import rigify
 from rigify.utils import get_rig_type
 from rigify import generate
@@ -194,7 +193,8 @@ class Generate(bpy.types.Operator):
     bl_label = "Rigify Generate Rig"
 
     def execute(self, context):
-        reload(generate)
+        import imp
+        imp.reload(generate)
 
         try:
             generate.generate_rig(context, context.object)
diff --git a/rigify/utils.py b/rigify/utils.py
index 33170ec2..84d4c4f1 100644
--- a/rigify/utils.py
+++ b/rigify/utils.py
@@ -17,7 +17,7 @@
 #======================= END GPL LICENSE BLOCK ========================
 
 import bpy
-from imp import reload
+import imp
 from random import randint
 from mathutils import Vector
 from math import ceil, floor
@@ -355,7 +355,7 @@ def get_rig_type(rig_type):
     """
     #print("%s.%s.%s" % (__package__,RIG_DIR,rig_type))
     submod = __import__(name="%s.%s.%s" % (MODULE_NAME, RIG_DIR, rig_type), fromlist=[rig_type])
-    reload(submod)
+    imp.reload(submod)
     return submod