[Bf-blender-cvs] [97e9b953a41] soc-2020-greasepencil-curve: Merge branch 'greasepencil-edit-curve' into soc-2020-greasepencil-curve

Falk David noreply at git.blender.org
Fri Jun 12 11:12:56 CEST 2020


Commit: 97e9b953a41ce7a4cc6770d274b776e812de1144
Author: Falk David
Date:   Thu Jun 11 17:22:06 2020 +0200
Branches: soc-2020-greasepencil-curve
https://developer.blender.org/rB97e9b953a41ce7a4cc6770d274b776e812de1144

Merge branch 'greasepencil-edit-curve' into soc-2020-greasepencil-curve

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



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

diff --cc source/blender/makesrna/intern/rna_gpencil.c
index c665719928b,a69ae7c1fd6..bc51ac4e8f1
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@@ -171,25 -170,16 +171,34 @@@ static void rna_GPencil_curve_edit_mode
    rna_GPencil_update(bmain, scene, ptr);
  }
  
 +static void rna_GPencil_stroke_curve_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 +{
 +  bGPdata *gpd = (bGPdata *)ptr->owner_id;
 +
 +  if (GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) {
-     LISTBASE_FOREACH(bGPDlayer *, gpl, &gpd->layers) {
++    LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
 +      if (gpl->actframe != NULL) {
-         bGPDframe *gpf = gpl->actframe;
-         LISTBASE_FOREACH(bGPDstroke *, gps, &gpf->strokes) {
++        LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
 +          if (gps->editcurve != NULL) {
 +            gps->editcurve->flag |= GP_CURVE_RECALC_GEOMETRY;
 +            BKE_gpencil_stroke_geometry_update(gps);
 +          }
 +        }
 +      }
 +    }
 +  }
 +
-   /* Standard update. */
++  rna_GPencil_update(bmain, scene, ptr);
++}
++
+ static void rna_GPencil_curve_resolution_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+ {
+   bGPdata *gpd = (bGPdata *)ptr->owner_id;
+ 
+   if (GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) {
+     /* TODO GPXX */
+     /* Update any stroke selected with different resolution */
+   }
 -
 -  /* Standard update. */
    rna_GPencil_update(bmain, scene, ptr);
  }



More information about the Bf-blender-cvs mailing list