[Bf-blender-cvs] [bc958747b74] greasepencil-object: GPencil: Add inverse matrix to macro

Antonioya noreply at git.blender.org
Sat Aug 10 13:18:24 CEST 2019


Commit: bc958747b742464f143e7a07344afd0cb70b3785
Author: Antonioya
Date:   Sat Aug 10 13:17:51 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBbc958747b742464f143e7a07344afd0cb70b3785

GPencil: Add inverse matrix to macro

This makes the macro similar to editable macro.

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

M	source/blender/editors/gpencil/gpencil_intern.h

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

diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 73c9d9d6d84..94e8ee28881 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -587,6 +587,7 @@ typedef enum ACTCONT_TYPES {
 
 struct GP_EditableStrokes_Iter {
   float diff_mat[4][4];
+  float inverse_diff_mat[4][4];
 };
 
 /**
@@ -611,6 +612,7 @@ struct GP_EditableStrokes_Iter {
       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); \
           /* loop over strokes */ \
           bGPDstroke *gpsn_; \
           for (bGPDstroke *gps = gpf_->strokes.first; gps; gps = gpsn_) { \
@@ -663,6 +665,7 @@ struct GP_EditableStrokes_Iter {
         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 derived frame with modifiers applied */ \
             bGPDframe *derived_gpf_ = &obeval_->runtime.derived_frames[derived_idx]; \
             /* loop over strokes */ \



More information about the Bf-blender-cvs mailing list