From 5638db749529a77ef4bf8421e1a90eeee6994d5c Mon Sep 17 00:00:00 2001 From: Charlie Jolly Date: Tue, 18 Dec 2018 19:18:32 +0000 Subject: Fix T58335: Grease Pencil Objects in Edit Mode have transform gizmos in wrong location Original fix P874 with changes from @brecht --- source/blender/editors/transform/transform_gizmo_3d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 84d9930871a..1913e35c1da 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -782,9 +782,10 @@ int ED_transform_calc_gizmo_stats( if (is_gp_edit) { float diff_mat[4][4]; + const bool use_mat_local = true; for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { /* only editable and visible layers are considered */ - const bool use_mat_local = gpl->parent != NULL; + if (gpencil_layer_is_editable(gpl) && (gpl->actframe != NULL)) { /* calculate difference matrix */ -- cgit v1.2.3