Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/object/object_relations.c
| Show First 20 Lines • Show All 893 Lines • ▼ Show 20 Lines | else { | ||||
| } | } | ||||
| /* get corrected inverse */ | /* get corrected inverse */ | ||||
| ob->partype = PAROBJECT; | ob->partype = PAROBJECT; | ||||
| BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob); | BKE_object_workob_calc_parent(depsgraph, scene, ob, &workob); | ||||
| invert_m4_m4(ob->parentinv, workob.obmat); | invert_m4_m4(ob->parentinv, workob.obmat); | ||||
| } | } | ||||
| else if (pararm && (ob->type == OB_GPENCIL) && (par->type == OB_ARMATURE)) { | else if (pararm && (ob->type == OB_GPENCIL) && (par->type == OB_ARMATURE)) { | ||||
| if (partype == PAR_ARMATURE_NAME) { | if (partype == PAR_ARMATURE) { | ||||
| ED_gpencil_add_armature(C, reports, ob, par); | |||||
| } | |||||
| else if (partype == PAR_ARMATURE_NAME) { | |||||
| ED_gpencil_add_armature_weights(C, reports, ob, par, GP_PAR_ARMATURE_NAME); | ED_gpencil_add_armature_weights(C, reports, ob, par, GP_PAR_ARMATURE_NAME); | ||||
| } | } | ||||
| else if ((partype == PAR_ARMATURE_AUTO) || (partype == PAR_ARMATURE_ENVELOPE)) { | else if ((partype == PAR_ARMATURE_AUTO) || (partype == PAR_ARMATURE_ENVELOPE)) { | ||||
| WM_cursor_wait(1); | WM_cursor_wait(1); | ||||
| ED_gpencil_add_armature_weights(C, reports, ob, par, GP_PAR_ARMATURE_AUTO); | ED_gpencil_add_armature_weights(C, reports, ob, par, GP_PAR_ARMATURE_AUTO); | ||||
| WM_cursor_wait(0); | WM_cursor_wait(0); | ||||
| } | } | ||||
| /* get corrected inverse */ | /* get corrected inverse */ | ||||
| ▲ Show 20 Lines • Show All 1,927 Lines • Show Last 20 Lines | |||||