From 364678d04ac37542969bf43a23c559e1d4da459e Mon Sep 17 00:00:00 2001 From: Alan O'Cull Date: Mon, 26 Feb 2024 16:54:40 -0500 Subject: [PATCH 1/2] Import jetpack model, requires rigging --- animations/infantry/anims-alan.blend | 4 ++-- characters/infantry/p10-rigging.blend | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/animations/infantry/anims-alan.blend b/animations/infantry/anims-alan.blend index 6fdc7ca..bd72044 100644 --- a/animations/infantry/anims-alan.blend +++ b/animations/infantry/anims-alan.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c33edd33caebfe5ab17b85c3449c807bdda9af0b24e091b0e6d4195767a52c18 -size 2812568 +oid sha256:b96b184291ecb373a2ac19823eb0abd9345ed6b66351516400b934eee72f14c8 +size 2851756 diff --git a/characters/infantry/p10-rigging.blend b/characters/infantry/p10-rigging.blend index 1598eed..a1a932a 100644 --- a/characters/infantry/p10-rigging.blend +++ b/characters/infantry/p10-rigging.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93a2b82f27d82be5e2ce6abb73aa578b3828ce4b4e86f16b358ab1dbf45104c3 -size 5399504 +oid sha256:e09f944af330d2490eb52d28e520288ccc14f13b0654ed29ff1fd7d9f4807f48 +size 5618417 From f7484ce22bc3c13f2467c8ab303e495e4223389b Mon Sep 17 00:00:00 2001 From: alan Date: Mon, 26 Feb 2024 22:30:04 -0500 Subject: [PATCH 2/2] Add jetpack to rigging --- characters/infantry/p10-rigging.blend | 4 ++-- characters/infantry/post_rig.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/characters/infantry/p10-rigging.blend b/characters/infantry/p10-rigging.blend index a1a932a..041cb61 100644 --- a/characters/infantry/p10-rigging.blend +++ b/characters/infantry/p10-rigging.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e09f944af330d2490eb52d28e520288ccc14f13b0654ed29ff1fd7d9f4807f48 -size 5618417 +oid sha256:d2b10bb9d115f238fa03e4ecd1d04f3fc96a488d8c07099cbeb5ff800749a4d7 +size 5633721 diff --git a/characters/infantry/post_rig.py b/characters/infantry/post_rig.py index 26b3881..b87e4cf 100644 --- a/characters/infantry/post_rig.py +++ b/characters/infantry/post_rig.py @@ -182,6 +182,9 @@ for b in rig.pose.bones: arrcopy(b.lock_rotation, [True, True, True]) arrcopy(b.lock_scale, [True, False, True]) b.lock_rotation_w = True + + elif b.name == "jetpack_grip": + b.custom_shape_scale_xyz = (1.25, 2.5, 0.8) ## BODY elif b.name == "neck.001":