[Bf-blender-cvs] [28d21cd6005] temp-gpencil-fill: GPencil:In multiframe fill don't use as selected active frame

[Antonio Vazquez]

Commit: 28d21cd6005083c5340bff2baefc608573acf623
Author: Antonio Vazquez
Date:   Sun Jan 31 19:13:07 2021 +0100
Branches: temp-gpencil-fill
https://developer.blender.org/rB28d21cd6005083c5340bff2baefc608573acf623

GPencil:In multiframe fill don't use as selected active frame

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

M	source/blender/blenkernel/intern/gpencil.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 037853f9c23..5c297157556 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2946,7 +2946,8 @@ void BKE_gpencil_frame_selected_hash(const struct bGPdata *gpd, struct GHash *r_
 
   LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
     LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) {
-      if ((gpf == gpl->actframe) || ((gpf->flag & GP_FRAME_SELECT) && (is_multiedit))) {
+      if (((gpf == gpl->actframe) && (!is_multiedit)) ||
+          ((gpf->flag & GP_FRAME_SELECT) && (is_multiedit))) {
         if (!BLI_ghash_lookup(r_list, POINTER_FROM_INT(gpf->framenum))) {
           BLI_ghash_insert(r_list, POINTER_FROM_INT(gpf->framenum), gpf);
         }