[Bf-blender-cvs] [57511b3eb10] greasepencil-object: GPencil: Cleanup - Remove unused code
Antonio Vazquez
noreply at git.blender.org
Mon Feb 24 17:56:01 CET 2020
Commit: 57511b3eb10222fdaa04ed63e82953eb1a3aa6bc
Author: Antonio Vazquez
Date: Mon Feb 24 17:26:31 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB57511b3eb10222fdaa04ed63e82953eb1a3aa6bc
GPencil: Cleanup - Remove unused code
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
index 78da54f982f..9b621ccce4b 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilvertexcolor.c
@@ -96,52 +96,6 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
}
}
-static void gpencil_parent_location(const Depsgraph *depsgraph,
- Object *ob,
- bGPDlayer *gpl,
- float diff_mat[4][4])
-{
- Object *ob_eval = depsgraph != NULL ? DEG_get_evaluated_object(depsgraph, ob) : ob;
- Object *obparent = gpl->parent;
- Object *obparent_eval = depsgraph != NULL ? DEG_get_evaluated_object(depsgraph, obparent) :
- obparent;
-
- /* if not layer parented, try with object parented */
- if (obparent_eval == NULL) {
- if (ob_eval != NULL) {
- copy_m4_m4(diff_mat, ob_eval->obmat);
- return;
- }
- unit_m4(diff_mat);
- return;
- }
- else {
- if ((gpl->partype == PAROBJECT) || (gpl->partype == PARSKEL)) {
- mul_m4_m4m4(diff_mat, obparent_eval->obmat, gpl->inverse);
- add_v3_v3(diff_mat[3], ob_eval->obmat[3]);
- return;
- }
- else if (gpl->partype == PARBONE) {
- bPoseChannel *pchan = BKE_pose_channel_find_name(obparent_eval->pose, gpl->parsubstr);
- if (pchan) {
- float tmp_mat[4][4];
- mul_m4_m4m4(tmp_mat, obparent_eval->obmat, pchan->pose_mat);
- mul_m4_m4m4(diff_mat, tmp_mat, gpl->inverse);
- add_v3_v3(diff_mat[3], ob_eval->obmat[3]);
- }
- else {
- /* if bone not found use object (armature) */
- mul_m4_m4m4(diff_mat, obparent_eval->obmat, gpl->inverse);
- add_v3_v3(diff_mat[3], ob_eval->obmat[3]);
- }
- return;
- }
- else {
- unit_m4(diff_mat); /* not defined type */
- }
- }
-}
-
/* deform stroke */
static void deformStroke(GpencilModifierData *md,
Depsgraph *depsgraph,
More information about the Bf-blender-cvs
mailing list