diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:18:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:19:10 +0300 |
commit | 4c132dc503c7c9506e301be5b479c6c579ce9723 (patch) | |
tree | 0cdd69eed9169d4b30a8c37dd33e5f80790ce3cc /rigify | |
parent | 772b5e1e245b76f0aab8b962d1e537b75ec0fbfe (diff) | |
parent | f1c55295b0d95307559c1f8b09d6b8bd6c8bbbf0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'rigify')
-rw-r--r-- | rigify/legacy/generate.py | 2 | ||||
-rw-r--r-- | rigify/legacy/metarigs/pitchipoy_human.py | 2 | ||||
-rw-r--r-- | rigify/legacy/rigs/pitchipoy/super_face.py | 1 | ||||
-rw-r--r-- | rigify/legacy/rigs/pitchipoy/super_finger.py | 5 | ||||
-rw-r--r-- | rigify/legacy/rigs/pitchipoy/super_widgets.py | 2 | ||||
-rw-r--r-- | rigify/metarigs/Animals/bird.py | 2 | ||||
-rw-r--r-- | rigify/metarigs/Animals/cat.py | 2 | ||||
-rw-r--r-- | rigify/metarigs/Animals/horse.py | 2 | ||||
-rw-r--r-- | rigify/metarigs/Animals/shark.py | 2 | ||||
-rw-r--r-- | rigify/metarigs/Animals/wolf.py | 2 | ||||
-rw-r--r-- | rigify/metarigs/Basic/basic_human.py | 2 | ||||
-rw-r--r-- | rigify/metarigs/Basic/basic_quadruped.py | 2 | ||||
-rw-r--r-- | rigify/metarigs/human.py | 2 | ||||
-rw-r--r-- | rigify/rigs/experimental/super_chain.py | 2 | ||||
-rw-r--r-- | rigify/rigs/faces/super_face.py | 1 | ||||
-rw-r--r-- | rigify/rigs/limbs/arm.py | 2 | ||||
-rw-r--r-- | rigify/rigs/limbs/leg.py | 2 | ||||
-rw-r--r-- | rigify/rigs/limbs/paw.py | 2 | ||||
-rw-r--r-- | rigify/rigs/limbs/simple_tentacle.py | 2 | ||||
-rw-r--r-- | rigify/rigs/limbs/super_finger.py | 5 | ||||
-rw-r--r-- | rigify/rigs/widgets.py | 1 |
21 files changed, 15 insertions, 30 deletions
diff --git a/rigify/legacy/generate.py b/rigify/legacy/generate.py index f1d9c8b0..eb3c3112 100644 --- a/rigify/legacy/generate.py +++ b/rigify/legacy/generate.py @@ -479,4 +479,4 @@ def isPitchipoy(metarig): words = pb.rigify_type.partition('.') if words[0] == 'pitchipoy': return True - return False
\ No newline at end of file + return False diff --git a/rigify/legacy/metarigs/pitchipoy_human.py b/rigify/legacy/metarigs/pitchipoy_human.py index 56748768..98541c07 100644 --- a/rigify/legacy/metarigs/pitchipoy_human.py +++ b/rigify/legacy/metarigs/pitchipoy_human.py @@ -2717,4 +2717,4 @@ def create(obj): arm.layers = [(x in [0, 3, 5, 7, 10, 13, 16]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/legacy/rigs/pitchipoy/super_face.py b/rigify/legacy/rigs/pitchipoy/super_face.py index 79aa5e02..919f8439 100644 --- a/rigify/legacy/rigs/pitchipoy/super_face.py +++ b/rigify/legacy/rigs/pitchipoy/super_face.py @@ -2397,4 +2397,3 @@ def create_square_widget(rig, bone_name, size=1.0, bone_transform_name=None): return obj else: return None - diff --git a/rigify/legacy/rigs/pitchipoy/super_finger.py b/rigify/legacy/rigs/pitchipoy/super_finger.py index 68b2c7fa..32172542 100644 --- a/rigify/legacy/rigs/pitchipoy/super_finger.py +++ b/rigify/legacy/rigs/pitchipoy/super_finger.py @@ -407,8 +407,3 @@ def create_sample(obj): bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - - - - - diff --git a/rigify/legacy/rigs/pitchipoy/super_widgets.py b/rigify/legacy/rigs/pitchipoy/super_widgets.py index 8930ba91..72384a7c 100644 --- a/rigify/legacy/rigs/pitchipoy/super_widgets.py +++ b/rigify/legacy/rigs/pitchipoy/super_widgets.py @@ -160,5 +160,3 @@ def create_ballsocket_widget(rig, bone_name, size=1.0, bone_transform_name=None) return obj else: return None - - diff --git a/rigify/metarigs/Animals/bird.py b/rigify/metarigs/Animals/bird.py index f8ecd47d..a3331c29 100644 --- a/rigify/metarigs/Animals/bird.py +++ b/rigify/metarigs/Animals/bird.py @@ -1493,4 +1493,4 @@ def create(obj): arm.layers = [(x in [0, 3, 7, 10, 13, 16, 21, 24]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/metarigs/Animals/cat.py b/rigify/metarigs/Animals/cat.py index 206b6f64..d3de1192 100644 --- a/rigify/metarigs/Animals/cat.py +++ b/rigify/metarigs/Animals/cat.py @@ -2976,4 +2976,4 @@ def create(obj): arm.layers = [(x in [0, 3, 5, 7, 10, 13, 16, 19]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/metarigs/Animals/horse.py b/rigify/metarigs/Animals/horse.py index f7ebc68f..358a9ceb 100644 --- a/rigify/metarigs/Animals/horse.py +++ b/rigify/metarigs/Animals/horse.py @@ -1369,4 +1369,4 @@ def create(obj): arm.layers = [(x in [0, 3, 4, 7, 10, 13, 16, 19, 21]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/metarigs/Animals/shark.py b/rigify/metarigs/Animals/shark.py index 355e8197..1ee1d0d9 100644 --- a/rigify/metarigs/Animals/shark.py +++ b/rigify/metarigs/Animals/shark.py @@ -791,4 +791,4 @@ def create(obj): arm.layers = [(x in [0, 3, 5, 6, 8, 10]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/metarigs/Animals/wolf.py b/rigify/metarigs/Animals/wolf.py index e156421b..4cccf085 100644 --- a/rigify/metarigs/Animals/wolf.py +++ b/rigify/metarigs/Animals/wolf.py @@ -3224,4 +3224,4 @@ def create(obj): arm.layers = [(x in [0, 3, 4, 5, 7, 10, 13, 16, 19]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/metarigs/Basic/basic_human.py b/rigify/metarigs/Basic/basic_human.py index 6492509b..01367a7b 100644 --- a/rigify/metarigs/Basic/basic_human.py +++ b/rigify/metarigs/Basic/basic_human.py @@ -681,4 +681,4 @@ def create(obj): arm.layers = [(x in [3, 7, 10, 13, 16]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/metarigs/Basic/basic_quadruped.py b/rigify/metarigs/Basic/basic_quadruped.py index 46143b36..5aa9f657 100644 --- a/rigify/metarigs/Basic/basic_quadruped.py +++ b/rigify/metarigs/Basic/basic_quadruped.py @@ -816,4 +816,4 @@ def create(obj): arm.layers = [(x in [3, 4, 7, 10, 13, 16, 19]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/metarigs/human.py b/rigify/metarigs/human.py index 337180a5..bbba8eed 100644 --- a/rigify/metarigs/human.py +++ b/rigify/metarigs/human.py @@ -2715,4 +2715,4 @@ def create(obj): arm.layers = [(x in [0, 3, 5, 7, 10, 13, 16]) for x in range(32)] if __name__ == "__main__": - create(bpy.context.active_object)
\ No newline at end of file + create(bpy.context.active_object) diff --git a/rigify/rigs/experimental/super_chain.py b/rigify/rigs/experimental/super_chain.py index 3282ec4d..836bc285 100644 --- a/rigify/rigs/experimental/super_chain.py +++ b/rigify/rigs/experimental/super_chain.py @@ -1425,4 +1425,4 @@ def create_sample(obj): bone.select_tail = True arm.edit_bones.active = bone - arm.layers = [(x in [0]) for x in range(32)]
\ No newline at end of file + arm.layers = [(x in [0]) for x in range(32)] diff --git a/rigify/rigs/faces/super_face.py b/rigify/rigs/faces/super_face.py index ee765ec7..2c4999d5 100644 --- a/rigify/rigs/faces/super_face.py +++ b/rigify/rigs/faces/super_face.py @@ -2427,4 +2427,3 @@ def create_square_widget(rig, bone_name, size=1.0, bone_transform_name=None): return obj else: return None - diff --git a/rigify/rigs/limbs/arm.py b/rigify/rigs/limbs/arm.py index 6ec087ac..fd1aa41f 100644 --- a/rigify/rigs/limbs/arm.py +++ b/rigify/rigs/limbs/arm.py @@ -1615,4 +1615,4 @@ def create_sample(obj): if __name__ == "__main__": - create_sample(bpy.context.active_object)
\ No newline at end of file + create_sample(bpy.context.active_object) diff --git a/rigify/rigs/limbs/leg.py b/rigify/rigs/limbs/leg.py index c2414748..ae705796 100644 --- a/rigify/rigs/limbs/leg.py +++ b/rigify/rigs/limbs/leg.py @@ -1643,4 +1643,4 @@ def create_sample(obj): if __name__ == "__main__": - create_sample(bpy.context.active_object)
\ No newline at end of file + create_sample(bpy.context.active_object) diff --git a/rigify/rigs/limbs/paw.py b/rigify/rigs/limbs/paw.py index f202c709..1f1d0a82 100644 --- a/rigify/rigs/limbs/paw.py +++ b/rigify/rigs/limbs/paw.py @@ -1642,4 +1642,4 @@ def create_sample(obj): if __name__ == "__main__": - create_sample(bpy.context.active_object)
\ No newline at end of file + create_sample(bpy.context.active_object) diff --git a/rigify/rigs/limbs/simple_tentacle.py b/rigify/rigs/limbs/simple_tentacle.py index 310ed7ab..39c59e12 100644 --- a/rigify/rigs/limbs/simple_tentacle.py +++ b/rigify/rigs/limbs/simple_tentacle.py @@ -274,7 +274,7 @@ def parameters_ui(layout, params): if bone_layers[i]: icon = "LAYER_ACTIVE" row.prop(params, "tweak_layers", index=i, toggle=True, text="", icon=icon) - + col = r.column(align=True) row = col.row(align=True) diff --git a/rigify/rigs/limbs/super_finger.py b/rigify/rigs/limbs/super_finger.py index 6aacc025..4dacdf5b 100644 --- a/rigify/rigs/limbs/super_finger.py +++ b/rigify/rigs/limbs/super_finger.py @@ -407,8 +407,3 @@ def create_sample(obj): bone.select_head = True bone.select_tail = True arm.edit_bones.active = bone - - - - - diff --git a/rigify/rigs/widgets.py b/rigify/rigs/widgets.py index c8f618c8..8461d82a 100644 --- a/rigify/rigs/widgets.py +++ b/rigify/rigs/widgets.py @@ -183,4 +183,3 @@ def create_gear_widget(rig, bone_name, size=1.0, bone_transform_name=None): return obj else: return None - |