[Bf-blender-cvs] [f6c2f1c65e1] master: Fix T101455: GPencil Gizmo in wrong location when using Active Element

Antonio Vazquez noreply at git.blender.org
Thu Sep 29 13:38:35 CEST 2022


Commit: f6c2f1c65e146bf20b9182f275b67c747d9e2990
Author: Antonio Vazquez
Date:   Thu Sep 29 13:38:12 2022 +0200
Branches: master
https://developer.blender.org/rBf6c2f1c65e146bf20b9182f275b67c747d9e2990

Fix T101455: GPencil Gizmo in wrong location when using Active Element

The gizmo was not set when this option was selected.

By design, in grease pencil the active element option uses
the object origin as pivot point.

===================================================================

M	source/blender/editors/transform/transform_gizmo_3d.c

===================================================================

diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index 8e6a6c2c411..32e9421f50d 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -1101,8 +1101,13 @@ static void gizmo_prepare_mat(const bContext *C,
 
       if (scene->toolsettings->transform_pivot_point == V3D_AROUND_ACTIVE) {
         bGPdata *gpd = CTX_data_gpencil_data(C);
+        /* Grease Pencil uses object origin. */
         if (gpd && (gpd->flag & GP_DATA_STROKE_EDITMODE)) {
-          /* pass */
+          BKE_view_layer_synced_ensure(scene, view_layer);
+          Object *ob = BKE_view_layer_active_object_get(view_layer);
+          if (ob != NULL) {
+            ED_object_calc_active_center(ob, false, rv3d->twmat[3]);
+          }
         }
         else {
           BKE_view_layer_synced_ensure(scene, view_layer);



More information about the Bf-blender-cvs mailing list