[Bf-blender-cvs] [0186bed90aa] temp-gpencil-camera-reproject: GPencil: Rename var
Antonio Vazquez
noreply at git.blender.org
Sat May 29 16:26:34 CEST 2021
Commit: 0186bed90aa6574af46ce9566fcbb9c9ae2b7e42
Author: Antonio Vazquez
Date: Sat May 29 16:26:29 2021 +0200
Branches: temp-gpencil-camera-reproject
https://developer.blender.org/rB0186bed90aa6574af46ce9566fcbb9c9ae2b7e42
GPencil: Rename var
===================================================================
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_utils.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 173332024f8..0bdd7c264f4 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -274,7 +274,7 @@ bool gpencil_point_xy_to_3d(const GP_SpaceConversion *gsc,
bool gpencil_point_render_xy_to_3d(const GP_SpaceConversion *gsc,
float persmat[4][4],
float persinv[4][4],
- const float screen_co[2],
+ const float render_co[2],
float r_out[3]);
/* helper to convert 2d to 3d */
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 6aae2515a35..d570fd6875e 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -978,7 +978,7 @@ bool gpencil_point_xy_to_3d(const GP_SpaceConversion *gsc,
bool gpencil_point_render_xy_to_3d(const GP_SpaceConversion *gsc,
float persmat[4][4],
float persinv[4][4],
- const float screen_co[2],
+ const float render_co[2],
float r_out[3])
{
float rvec[3];
@@ -1011,7 +1011,7 @@ bool gpencil_point_render_xy_to_3d(const GP_SpaceConversion *gsc,
float mval_f[2], mval_prj[2];
float dvec[3];
- copy_v2_v2(mval_f, screen_co);
+ copy_v2_v2(mval_f, render_co);
if (ED_view3d_project_float_ex(gsc->region, persmat, false, rvec, mval_prj, V3D_PROJ_TEST_NOP) ==
V3D_PROJ_RET_OK) {
More information about the Bf-blender-cvs
mailing list