[Bf-blender-cvs] [34063250aef] soc-2020-greasepencil-curve: GPencil: Fix view_selected

Falk David noreply at git.blender.org
Mon Sep 7 15:46:22 CEST 2020


Commit: 34063250aef35c2e4e03664da9ade24ca151f683
Author: Falk David
Date:   Mon Sep 7 15:44:54 2020 +0200
Branches: soc-2020-greasepencil-curve
https://developer.blender.org/rB34063250aef35c2e4e03664da9ade24ca151f683

GPencil: Fix view_selected

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

M	source/blender/editors/space_view3d/view3d_edit.c

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

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index e78f4e94614..63bcdb9c1ff 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -46,6 +46,7 @@
 #include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_font.h"
+#include "BKE_gpencil_curve.h"
 #include "BKE_gpencil_geom.h"
 #include "BKE_layer.h"
 #include "BKE_lib_id.h"
@@ -3054,8 +3055,11 @@ static int viewselected_exec(bContext *C, wmOperator *op)
     const bool is_curve_edit = GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd_eval);
     CTX_DATA_BEGIN (C, bGPDstroke *, gps, editable_gpencil_strokes) {
       /* we're only interested in selected points here... */
-      if (((gps->flag & GP_STROKE_SELECT) && (gps->flag & GP_STROKE_3DSPACE)) ||
-          (is_curve_edit && gps->editcurve != NULL && gps->editcurve->flag & GP_CURVE_SELECT)) {
+      if (is_curve_edit && gps->editcurve != NULL && gps->editcurve->flag & GP_CURVE_SELECT) {
+        BKE_gpencil_stroke_editcurve_sync_selection(gps, gps->editcurve);
+        ok |= BKE_gpencil_stroke_minmax(gps, true, min, max);
+      }
+      else if ((gps->flag & GP_STROKE_SELECT) && (gps->flag & GP_STROKE_3DSPACE)) {
         ok |= BKE_gpencil_stroke_minmax(gps, true, min, max);
       }
     }



More information about the Bf-blender-cvs mailing list