[Bf-extensions-cvs] [81ed542c] master: Rigify: Clean up imports
Demeter Dzadik
noreply at git.blender.org
Thu Jun 25 12:34:30 CEST 2020
Commit: 81ed542cead8626fee4f9ec478c67a71c2e1bf05
Author: Demeter Dzadik
Date: Thu Jun 25 13:30:01 2020 +0300
Branches: master
https://developer.blender.org/rBA81ed542cead8626fee4f9ec478c67a71c2e1bf05
Rigify: Clean up imports
Just removing some unused imports.
I tested generating every built-in metarig to make sure I didn't remove any imports that were actually used. I also tested installing and using a feature-set.
Reviewed By: angavrilov
Differential Revision: https://developer.blender.org/D8026
===================================================================
M rigify/__init__.py
M rigify/base_rig.py
M rigify/generate.py
M rigify/legacy/rigs/pitchipoy/limbs/arm.py
M rigify/legacy/rigs/pitchipoy/limbs/leg.py
M rigify/legacy/rigs/pitchipoy/limbs/paw.py
M rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
M rigify/legacy/rigs/pitchipoy/simple_tentacle.py
M rigify/legacy/rigs/pitchipoy/super_face.py
M rigify/legacy/rigs/pitchipoy/super_finger.py
M rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
M rigify/legacy/rigs/pitchipoy/super_widgets.py
M rigify/rig_ui_template.py
M rigify/rigs/basic/copy_chain.py
M rigify/rigs/experimental/super_chain.py
M rigify/rigs/faces/super_face.py
M rigify/rigs/limbs/arm.py
M rigify/rigs/limbs/leg.py
M rigify/rigs/limbs/limb_rigs.py
M rigify/rigs/limbs/paw.py
M rigify/rigs/limbs/simple_tentacle.py
M rigify/rigs/limbs/super_finger.py
M rigify/rigs/spines/basic_spine.py
M rigify/rigs/spines/basic_tail.py
M rigify/rigs/spines/super_head.py
M rigify/rigs/widgets.py
===================================================================
diff --git a/rigify/__init__.py b/rigify/__init__.py
index 6ae597e9..adfa6350 100644
--- a/rigify/__init__.py
+++ b/rigify/__init__.py
@@ -32,7 +32,6 @@ bl_info = {
import importlib
import sys
import bpy
-import os
# The order in which core modules of the addon are loaded and reloaded.
diff --git a/rigify/base_rig.py b/rigify/base_rig.py
index b7a5d08c..c4ddc128 100644
--- a/rigify/base_rig.py
+++ b/rigify/base_rig.py
@@ -18,10 +18,6 @@
# <pep8 compliant>
-import bpy
-import sys
-import traceback
-
from .utils.errors import RaiseErrorMixin
from .utils.bones import BoneDict, BoneUtilityMixin
from .utils.mechanism import MechanismUtilityMixin
diff --git a/rigify/generate.py b/rigify/generate.py
index 0fe89175..f7929c7b 100644
--- a/rigify/generate.py
+++ b/rigify/generate.py
@@ -21,17 +21,14 @@
import bpy
import re
import time
-import traceback
-import sys
from rna_prop_ui import rna_idprop_ui_prop_get
-from .utils.errors import MetarigError
from .utils.bones import new_bone
from .utils.layers import ORG_LAYER, MCH_LAYER, DEF_LAYER, ROOT_LAYER
from .utils.naming import ORG_PREFIX, MCH_PREFIX, DEF_PREFIX, ROOT_NAME, make_original_name
from .utils.widgets import WGT_PREFIX
from .utils.widgets_special import create_root_widget
-from .utils.misc import copy_attributes, gamma_correct, select_object
+from .utils.misc import gamma_correct, select_object
from .utils.collections import ensure_widget_collection, list_layer_collections, filter_layer_collections_by_object
from . import base_generate
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/arm.py b/rigify/legacy/rigs/pitchipoy/limbs/arm.py
index 2bf0fe6f..2c68c2c0 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/arm.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/arm.py
@@ -18,10 +18,8 @@
# <pep8 compliant>
import bpy
-from ....utils import MetarigError
-from ....utils import create_widget, copy_bone
-from ....utils import strip_org
-from .limb_utils import *
+from ....utils import copy_bone
+from .limb_utils import get_bone_name, make_constraint
from ..super_widgets import create_hand_widget
from .....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/leg.py b/rigify/legacy/rigs/pitchipoy/limbs/leg.py
index 360a2a49..9abf956f 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/leg.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/leg.py
@@ -18,12 +18,11 @@
# <pep8 compliant>
import bpy, math
-from ....utils import MetarigError, connected_children_names
-from ....utils import create_widget, copy_bone, create_circle_widget
-from ....utils import strip_org, flip_bone, put_bone
+from ....utils import connected_children_names, create_circle_widget
+from ....utils import copy_bone, flip_bone, put_bone
from rna_prop_ui import rna_idprop_ui_prop_get
from ..super_widgets import create_foot_widget, create_ballsocket_widget
-from .limb_utils import *
+from .limb_utils import orient_bone, make_constraint, get_bone_name
from .....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/paw.py b/rigify/legacy/rigs/pitchipoy/limbs/paw.py
index dd9fa1e7..2fdb56f7 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/paw.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/paw.py
@@ -18,12 +18,11 @@
# <pep8 compliant>
import bpy
-from ....utils import MetarigError, connected_children_names
-from ....utils import create_widget, copy_bone, create_circle_widget
-from ....utils import strip_org, flip_bone
+from ....utils import connected_children_names, create_circle_widget
+from ....utils import copy_bone, flip_bone
from rna_prop_ui import rna_idprop_ui_prop_get
from ..super_widgets import create_foot_widget, create_ballsocket_widget
-from .limb_utils import *
+from .limb_utils import orient_bone, make_constraint, get_bone_name
from .....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py b/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
index 5852ad46..daedbaca 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
@@ -3,12 +3,10 @@ from .arm import create_arm
from .leg import create_leg
from .paw import create_paw
from .ui import create_script
-from .limb_utils import *
+from .limb_utils import orient_bone, make_constraint, get_bone_name
from mathutils import Vector
-from ....utils import copy_bone, flip_bone, put_bone, create_cube_widget
-from ....utils import strip_org, make_deformer_name, create_widget
+from ....utils import copy_bone, put_bone, strip_org
from ....utils import create_circle_widget, create_sphere_widget
-from ....utils import MetarigError, make_mechanism_name, org
from ....utils import create_limb_widget, connected_children_names
from ..super_widgets import create_ikarrow_widget
from math import trunc
diff --git a/rigify/legacy/rigs/pitchipoy/simple_tentacle.py b/rigify/legacy/rigs/pitchipoy/simple_tentacle.py
index facb2b90..46166db9 100644
--- a/rigify/legacy/rigs/pitchipoy/simple_tentacle.py
+++ b/rigify/legacy/rigs/pitchipoy/simple_tentacle.py
@@ -1,10 +1,9 @@
import bpy
from ...utils import copy_bone
from ...utils import strip_org, make_deformer_name, connected_children_names
-from ...utils import make_mechanism_name, put_bone, create_sphere_widget
-from ...utils import create_widget, create_circle_widget
+from ...utils import put_bone, create_sphere_widget
+from ...utils import create_circle_widget
from ...utils import MetarigError
-from rna_prop_ui import rna_idprop_ui_prop_get
class Rig:
diff --git a/rigify/legacy/rigs/pitchipoy/super_face.py b/rigify/legacy/rigs/pitchipoy/super_face.py
index 5a46299a..45347060 100644
--- a/rigify/legacy/rigs/pitchipoy/super_face.py
+++ b/rigify/legacy/rigs/pitchipoy/super_face.py
@@ -2,8 +2,7 @@ import bpy, re
from mathutils import Vector
from ...utils import copy_bone, flip_bone
from ...utils import org, strip_org, make_deformer_name, connected_children_names, make_mechanism_name
-from ...utils import create_circle_widget, create_sphere_widget, create_widget, create_cube_widget
-from ...utils import MetarigError
+from ...utils import create_widget
from .super_widgets import create_face_widget, create_eye_widget, create_eyes_widget, create_ear_widget, create_jaw_widget, create_teeth_widget
from ....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/super_finger.py b/rigify/legacy/rigs/pitchipoy/super_finger.py
index a1b7a506..05c32829 100644
--- a/rigify/legacy/rigs/pitchipoy/super_finger.py
+++ b/rigify/legacy/rigs/pitchipoy/super_finger.py
@@ -1,9 +1,7 @@
import bpy
-from mathutils import Vector
from ...utils import copy_bone, flip_bone
from ...utils import strip_org, make_deformer_name, connected_children_names, make_mechanism_name
-from ...utils import create_circle_widget, create_sphere_widget, create_widget
-from ...utils import MetarigError
+from ...utils import MetarigError, create_circle_widget, create_widget
from ....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py b/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
index 05c2b4c6..08d06a03 100644
--- a/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
+++ b/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
@@ -1,8 +1,8 @@
import bpy
from mathutils import Vector
-from ...utils import copy_bone, flip_bone, put_bone, org
+from ...utils import copy_bone, put_bone, org
from ...utils import strip_org, make_deformer_name, connected_children_names
-from ...utils import create_circle_widget, create_sphere_widget, create_widget
+from ...utils import create_circle_widget, create_sphere_widget
from ...utils import MetarigError, make_mechanism_name, create_cube_widget
from ....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/super_widgets.py b/rigify/legacy/rigs/pitchipoy/super_widgets.py
index f442c590..fabc800b 100644
--- a/rigify/legacy/rigs/pitchipoy/super_widgets.py
+++ b/rigify/legacy/rigs/pitchipoy/super_widgets.py
@@ -1,6 +1,3 @@
-import bpy
-import importlib
-import importlib
from ...utils import create_widget
MODULE_NAME = "super_widgets" # Windows/Mac blender is weird, so __package__ doesn't work
diff --git a/rigify/rig_ui_template.py b/rigify/rig_ui_template.py
index 411c9417..4f0ba936 100644
--- a/rigify/rig_ui_template.py
+++ b/rigify/rig_ui_template.py
@@ -23,7 +23,6 @@ import bpy
from collections import OrderedDict
from .utils.animation import SCRIPT_REGISTER_BAKE, SCRIPT_UTILITIES_BAKE
-from .utils.layers import get_layers
from .utils.rig import attach_persistent_script
from . import base_generate
diff --git a/rigify/rigs/basic/copy_chain.py b/rigify/rigs/basic/copy_chain.py
index 232671f0..d43a83e5 100644
--- a/rigify/rigs/basic/copy_chain.py
+++ b/rigify/rigs/basic/copy_chain.py
@@ -21,13 +21,7 @@
import bpy
from ..chain_rigs import SimpleChainRig
-
-from ...utils.errors import MetarigError
-from ...utils.rig import connected_children_names
-from ...utils.naming import make_derived_name
-from ...utils.widgets_basic import create_bone_widget
-
-from ...base_rig import BaseRig, stage
+from ...base_rig import stage
class Rig(SimpleChainRig):
diff --git a/rigify/rigs/experimental/super_chain.py b/rigify/rigs/experimental/super_chain.py
index a5af8323..c0a0f09e 100644
--- a/rigify/rigs/experimental/super_chain.py
+++ b/rigify/rigs/experimental/super_chain.py
@@ -5,7 +5,6 @@ from ...utils import strip_org, make_deformer_name, connected_children_names
from ...utils import create_chain_widget
from ...utils import make_mechanism_name
from ...utils import ControlLayersOption
-from rna_prop_ui import rna_idprop_ui_prop_get
from ..limbs.limb_utils import get_bone_name
diff --git a/rigify/rigs/faces/super_face.py b/rigify/rigs/faces/super_face.py
index e482a7db..f945a855 100644
--- a/rigify/rigs/faces/super_face
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list