diff --git a/DmrBlender_VBM/vbm_op.py b/DmrBlender_VBM/vbm_op.py index 24e2c5b..456da79 100644 --- a/DmrBlender_VBM/vbm_op.py +++ b/DmrBlender_VBM/vbm_op.py @@ -383,9 +383,9 @@ class ExportVBSuper(bpy.types.Operator, ExportHelper): UVlyrProp = lambda i: bpy.props.EnumProperty(name="UV Layer", description='UV layer to reference', items=Items_UVLayers, default=0) vbf0 : VbfProp(0, VBF_POS) - vbf1 : VbfProp(1, VBF_000) - vbf2 : VbfProp(2, VBF_RGB) - vbf3 : VbfProp(3, VBF_UVS) + vbf1 : VbfProp(1, VBF_RGB) + vbf2 : VbfProp(2, VBF_UVS) + vbf3 : VbfProp(3, VBF_000) vbf4 : VbfProp(4, VBF_000) vbf5 : VbfProp(5, VBF_000) vbf6 : VbfProp(6, VBF_000) diff --git a/DmrBlender_VBM/vbm_op_action.py b/DmrBlender_VBM/vbm_op_action.py index a27ceef..7dcae95 100644 --- a/DmrBlender_VBM/vbm_op_action.py +++ b/DmrBlender_VBM/vbm_op_action.py @@ -413,8 +413,8 @@ def execute(self, context): step=max(1, bakesteps), only_selected=False, visual_keying=True, - clear_constraints=False, - clear_parents=False, + clear_constraints=True, + clear_parents=True, use_current_action=False, clean_curves=False, bake_types={'POSE'} diff --git a/blender/curly.blend b/blender/curly.blend index 80d4ddb..650830a 100644 Binary files a/blender/curly.blend and b/blender/curly.blend differ diff --git a/blender/curly.blend1 b/blender/curly.blend1 index 9278a2b..80d4ddb 100644 Binary files a/blender/curly.blend1 and b/blender/curly.blend1 differ diff --git a/vbm_demo/vbm_demo.yyp b/vbm_demo/vbm_demo.yyp index 65e4dec..402e49a 100644 --- a/vbm_demo/vbm_demo.yyp +++ b/vbm_demo/vbm_demo.yyp @@ -82,7 +82,6 @@ {"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, ], "IncludedFiles": [ - {"CopyToMask":-1,"filePath":"datafiles/model","resourceVersion":"1.0","name":"curly.vbm","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/model","resourceVersion":"1.0","name":"curly_simple.vb","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/model","resourceVersion":"1.0","name":"curly_normal.vb","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/model","resourceVersion":"1.0","name":"curly_rigged.vbm","resourceType":"GMIncludedFile",}, @@ -100,7 +99,7 @@ {"CopyToMask":-1,"filePath":"datafiles/animation","resourceVersion":"1.0","name":"anim_tsunami.trk","resourceType":"GMIncludedFile",}, ], "MetaData": { - "IDEVersion": "2022.1.0.609", + "IDEVersion": "2022.1.1.610", }, "resourceVersion": "1.4", "name": "vbm_demo",