[Bf-blender-cvs] [ab6513f964b] temp-gpencil-camera-reproject: GPencil: Fix compiler error and warnings
Antonio Vazquez
noreply at git.blender.org
Fri May 28 19:26:00 CEST 2021
Commit: ab6513f964b0524f3316c0a3c6f5c9c09dd6d8a9
Author: Antonio Vazquez
Date: Fri May 28 19:25:52 2021 +0200
Branches: temp-gpencil-camera-reproject
https://developer.blender.org/rBab6513f964b0524f3316c0a3c6f5c9c09dd6d8a9
GPencil: Fix compiler error and warnings
===================================================================
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 959d00c9b94..27dde2a1321 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1250,7 +1250,7 @@ static bool gpencil_calculate_persmat(Scene *scene, float persmat[4][4], float p
BKE_camera_params_compute_viewplane(¶ms, rd->xsch, rd->ysch, rd->xasp, rd->yasp);
BKE_camera_params_compute_matrix(¶ms);
- float viewmat[4][4], invview[4][4];
+ float viewmat[4][4];
invert_m4_m4(viewmat, cam_ob->obmat);
mul_m4_m4m4(persmat, params.winmat, viewmat);
@@ -1395,7 +1395,7 @@ void ED_gpencil_stroke_reproject(Depsgraph *depsgraph,
/* Convert to Render 2D space. */
ED_gpencil_project_point_to_render_space(gsc->scene, &pt2, persmat, is_ortho, xy);
/* Convert to Global Camera 3D space. */
- gpencil_point_render_xy_to_3d(gsc, persmat, xy, &pt->x);
+ gpencil_point_render_xy_to_3d(gsc, persmat, persinv, xy, &pt->x);
}
else {
/* Geometry - Snap to surfaces of visible geometry */
More information about the Bf-blender-cvs
mailing list