[Bf-blender-cvs] [3dd7267d5a9] greasepencil-object: Remove duplicate function

[Antonio Vazquez]

Commit: 3dd7267d5a93d0d708294f40b8172f8b26afdf19
Author: Antonio Vazquez
Date:   Fri Apr 14 12:13:46 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3dd7267d5a93d0d708294f40b8172f8b26afdf19

Remove duplicate function

Initially, the function to calculate the matrix was different, but now both are equal, so new function can be deleted.

===================================================================

M	source/blender/draw/engines/gpencil/gpencil_draw.c
M	source/blender/draw/engines/gpencil/gpencil_mode.c
M	source/blender/draw/engines/gpencil/gpencil_mode.h

===================================================================

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw.c b/source/blender/draw/engines/gpencil/gpencil_draw.c
index a9165f5782c..96100644326 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw.c
@@ -437,43 +437,3 @@ Batch *gpencil_get_edit_geom(bGPDstroke *gps, float alpha, short dflag)
 
 	return Batch_create(PRIM_POINTS, vbo, NULL);
 }
-
-void gpencil_get_parent_matrix(Object *obact, bGPdata *gpd, bGPDlayer *gpl, float diff_mat[4][4])
-{
-	Object *obparent = gpl->parent;
-
-	/* if not layer parented, try with object parented */
-	if (obparent == NULL) {
-		if (obact != NULL) {
-			/* the gpd can be scene, but a gpobject can be active, so need check gpd */
-			if ((obact->type == OB_GPENCIL) && (obact->gpd == gpd)) {
-				copy_m4_m4(diff_mat, obact->obmat);
-				return;
-			}
-		}
-		/* not gpencil object */
-		unit_m4(diff_mat);
-		return;
-	}
-	else {
-		if ((gpl->partype == PAROBJECT) || (gpl->partype == PARSKEL)) {
-			mul_m4_m4m4(diff_mat, obparent->obmat, gpl->inverse);
-			return;
-		}
-		else if (gpl->partype == PARBONE) {
-			bPoseChannel *pchan = BKE_pose_channel_find_name(obparent->pose, gpl->parsubstr);
-			if (pchan) {
-				float tmp_mat[4][4];
-				mul_m4_m4m4(tmp_mat, obparent->obmat, pchan->pose_mat);
-				mul_m4_m4m4(diff_mat, tmp_mat, gpl->inverse);
-			}
-			else {
-				mul_m4_m4m4(diff_mat, obparent->obmat, gpl->inverse); /* if bone not found use object (armature) */
-			}
-			return;
-		}
-		else {
-			unit_m4(diff_mat); /* not defined type */
-		}
-	}
-}
diff --git a/source/blender/draw/engines/gpencil/gpencil_mode.c b/source/blender/draw/engines/gpencil/gpencil_mode.c
index 3a922a10d27..6990b46d27e 100644
--- a/source/blender/draw/engines/gpencil/gpencil_mode.c
+++ b/source/blender/draw/engines/gpencil/gpencil_mode.c
@@ -284,7 +284,7 @@ static void GPENCIL_cache_populate(void *vedata, Object *ob)
 #endif
 
 			/* get parent matrix and set as static data */
-			gpencil_get_parent_matrix(ob, ob->gpd, gpl, matrix);
+			ED_gpencil_parent_location(ob, ob->gpd, gpl, matrix);
 			copy_m4_m4(stl->g_data->parents[i].matrix, matrix);
 
 			for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
diff --git a/source/blender/draw/engines/gpencil/gpencil_mode.h b/source/blender/draw/engines/gpencil/gpencil_mode.h
index 096b7ae241a..b7690656c3f 100644
--- a/source/blender/draw/engines/gpencil/gpencil_mode.h
+++ b/source/blender/draw/engines/gpencil/gpencil_mode.h
@@ -33,6 +33,5 @@ struct Batch *gpencil_get_fill_geom(struct bGPDstroke *gps, const float color[4]
 struct Batch *gpencil_get_edit_geom(struct bGPDstroke *gps, float alpha, short dflag);
 
 bool gpencil_can_draw_stroke(const struct bGPDstroke *gps);
-void gpencil_get_parent_matrix(struct Object *obact, struct bGPdata *gpd, struct bGPDlayer *gpl, float diff_mat[4][4]);
 
 #endif /* __GPENCIL_MODE_H__ */
\ No newline at end of file