Commit: d9373cce3657ae81680566035960fb5528c09204
Author: Antonio Vazquez
Date: Thu May 27 19:40:17 2021 +0200
Branches: temp-gpencil-camera-reproject
https://developer.blender.org/rBd9373cce3657ae81680566035960fb5528c09204
GPencil: Minor corrections
===================================================================
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 65016ffdf16..d3a73afd6e5 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1291,7 +1291,9 @@ void ED_gpencil_stroke_reproject(Depsgraph *depsgraph,
invert_m4_m4(inverse_diff_mat, diff_mat);
float persmat[4][4];
- const bool is_ortho = gpencil_calculate_persmat(gsc->scene, persmat);
+ const bool is_ortho = (mode == GP_REPROJECT_CAMERA) ?
+ gpencil_calculate_persmat(gsc->scene, persmat) :
+ false;
float origin[3];
if (mode != GP_REPROJECT_CURSOR) {
@@ -1377,8 +1379,6 @@ void ED_gpencil_stroke_reproject(Depsgraph *depsgraph,
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);
- /* Convert to object local space. */
- mul_m4_v3(inverse_diff_mat, &pt->x);
}
else {
/* Geometry - Snap to surfaces of visible geometry */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
