diff options
author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /source/blender/editors/gpencil/gpencil_uv.c | |
parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_uv.c')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_uv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_uv.c b/source/blender/editors/gpencil/gpencil_uv.c index 0dfc7e0728e..e21b2049028 100644 --- a/source/blender/editors/gpencil/gpencil_uv.c +++ b/source/blender/editors/gpencil/gpencil_uv.c @@ -148,7 +148,7 @@ static bool gpencil_uv_transform_init(bContext *C, wmOperator *op) opdata->ob = CTX_data_active_object(C); opdata->gpd = (bGPdata *)opdata->ob->data; - gp_point_conversion_init(C, &opdata->gsc); + gpencil_point_conversion_init(C, &opdata->gsc); opdata->array_loc = NULL; opdata->array_rot = NULL; opdata->array_scale = NULL; @@ -197,7 +197,7 @@ static bool gpencil_uv_transform_init(bContext *C, wmOperator *op) GP_EDITABLE_STROKES_END(gpstroke_iter); } /* Convert to 2D. */ - gp_point_3d_to_xy(&opdata->gsc, GP_STROKE_3DSPACE, center, opdata->mcenter); + gpencil_point_3d_to_xy(&opdata->gsc, GP_STROKE_3DSPACE, center, opdata->mcenter); return true; } |