diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2019-08-24 14:46:00 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2019-08-24 14:46:00 +0300 |
commit | 091e7979d314750ff9ecade6e7a3d0c08dba3a1a (patch) | |
tree | bd32d92960dc3333ed06bb3df535ab408a6e0a1a /source/blender/editors/gpencil/gpencil_intern.h | |
parent | b1ed72f152f041c3f907f9359ba2a7119d256876 (diff) |
GPencil: Use evaluated data in selection
Now the selection is using the position after evaluating the modifiers and makes possible to select a stroke point that has been moved from the original location.
Related to T66294
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_intern.h')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_intern.h | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 715665fe6e9..c2a9eae272f 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -639,6 +639,60 @@ struct GP_EditableStrokes_Iter { ((flag & (GP_SCULPT_MASK_SELECTMODE_POINT | GP_SCULPT_MASK_SELECTMODE_STROKE | \ GP_SCULPT_MASK_SELECTMODE_SEGMENT))) +/** + * Iterate over all editable strokes using evaluated data in the current context, + * stopping on each usable layer + stroke pair (i.e. gpl and gps) + * to perform some operations on the stroke. + * + * \param gpl: The identifier to use for the layer of the stroke being processed. + * Choose a suitable value to avoid name clashes. + * \param gps: The identifier to use for current stroke being processed. + * Choose a suitable value to avoid name clashes. + */ +#define GP_EVALUATED_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) \ + { \ + struct GP_EditableStrokes_Iter gpstroke_iter = {{{0}}}; \ + Depsgraph *depsgraph_ = CTX_data_ensure_evaluated_depsgraph(C); \ + Object *obact_ = CTX_data_active_object(C); \ + Object *obeval_ = DEG_get_evaluated_object(depsgraph_, obact_); \ + bGPdata *gpd_ = CTX_data_gpencil_data(C); \ + const bool is_multiedit_ = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd_); \ + int idx_eval = 0; \ + for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) { \ + if (gpencil_layer_is_editable(gpl)) { \ + bGPDframe *init_gpf_ = gpl->actframe; \ + if (is_multiedit_) { \ + init_gpf_ = gpl->frames.first; \ + } \ + for (bGPDframe *gpf_ = init_gpf_; gpf_; gpf_ = gpf_->next) { \ + if ((gpf_ == gpl->actframe) || ((gpf_->flag & GP_FRAME_SELECT) && is_multiedit_)) { \ + ED_gpencil_parent_location(depsgraph_, obact_, gpd_, gpl, gpstroke_iter.diff_mat); \ + invert_m4_m4(gpstroke_iter.inverse_diff_mat, gpstroke_iter.diff_mat); \ + /* get evaluated frame with modifiers applied */ \ + bGPDframe *gpf_eval_ = &obeval_->runtime.gpencil_evaluated_frames[idx_eval]; \ + /* loop over strokes */ \ + for (bGPDstroke *gps = gpf_eval_->strokes.first; gps; gps = gps->next) { \ + /* skip strokes that are invalid for current view */ \ + if (ED_gpencil_stroke_can_use(C, gps) == false) \ + continue; \ + /* check if the color is editable */ \ + if (ED_gpencil_stroke_color_use(obact_, gpl, gps) == false) \ + continue; \ + /* ... Do Stuff With Strokes ... */ + +#define GP_EVALUATED_STROKES_END(gpstroke_iter) \ + } \ + } \ + if (!is_multiedit_) { \ + break; \ + } \ + } \ + } \ + idx_eval++; \ + } \ + } \ + (void)0 + /* ****************************************************** */ #endif /* __GPENCIL_INTERN_H__ */ |