Commit: c0811b73b9815608ad28f0293d8fb75842a22392
Author: Antonio Vazquez
Date: Wed Jun 21 20:56:45 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc0811b73b9815608ad28f0293d8fb75842a22392
Fix merge error
===================================================================
M source/blender/editors/gpencil/gpencil_utils.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_utils.c
b/source/blender/editors/gpencil/gpencil_utils.c
index a477dada853..760633c003b 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -532,7 +532,7 @@ void gp_apply_parent(Object *obact, bGPdata *gpd, bGPDlayer
*gpl, bGPDstroke *gp
/**
* Change point position relative to parent object
*/
-void gp_apply_parent_point(bGPDlayer *gpl, bGPDspoint *pt)
+void gp_apply_parent_point(Object *obact, bGPdata *gpd, bGPDlayer *gpl,
bGPDspoint *pt)
{
/* undo matrix */
float diff_mat[4][4];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
