diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-06-21 20:49:33 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-06-21 20:49:33 +0300 |
| commit | 57a58857693265c3074a9ce44e68128edc7c88c0 (patch) | |
| tree | c553e7932d79ae1c57db74b0ef7070675abc326a /source/blender/editors/gpencil | |
| parent | 34c8a7accc1281b7affa58def54efd843cfea3da (diff) | |
GPencil: Fix merge errors
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index c409d7adedb..0176d8bfd28 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -1017,7 +1017,7 @@ bool gpencil_point_render_xy_to_3d(const GP_SpaceConversion *gsc, V3D_PROJ_RET_OK) { sub_v2_v2v2(mval_f, mval_prj, mval_f); - float dx = 2.0f * mval_f[0] * zfac / (scene->r.xsch * scene->r.size / 100.0f) ; + float dx = 2.0f * mval_f[0] * zfac / (scene->r.xsch * scene->r.size / 100.0f); float dy = 2.0f * mval_f[1] * zfac / (scene->r.ysch * scene->r.size / 100.0f); dvec[0] = (persinv[0][0] * dx + persinv[1][0] * dy); dvec[1] = (persinv[0][1] * dx + persinv[1][1] * dy); @@ -1410,6 +1410,7 @@ void ED_gpencil_stroke_reproject(Depsgraph *depsgraph, BLI_assert(gps->flag & GP_STROKE_3DSPACE); BLI_assert(gsc->area && gsc->area->spacetype == SPACE_VIEW3D); const View3D *v3d = gsc->area->spacedata.first; + gpencil_point_to_xy_fl(gsc, gps_active, &pt2, &xy[0], &xy[1]); ED_view3d_win_to_ray_clipped( depsgraph, region, v3d, xy, &ray_start[0], &ray_normal[0], true); if (ED_transform_snap_object_project_ray(sctx, |