[Bf-blender-cvs] [e4adc6b8459] temp-gpencil-bezier-v2: GPencil: remove curve edit mode keymap

[Falk David]

Commit: e4adc6b845994bd9d69bdca3001cccb6fb90abde
Author: Falk David
Date:   Thu Jan 21 12:58:31 2021 +0100
Branches: temp-gpencil-bezier-v2
https://developer.blender.org/rBe4adc6b845994bd9d69bdca3001cccb6fb90abde

GPencil: remove curve edit mode keymap

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

M	source/blender/editors/gpencil/gpencil_ops.c
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index a3d523f8c0c..dfa6fd4efb5 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -69,13 +69,6 @@ static bool gpencil_stroke_editmode_poll(bContext *C)
   return (gpd && (gpd->flag & GP_DATA_STROKE_EDITMODE));
 }
 
-/* Poll callback for stroke curve editing mode */
-static bool gpencil_stroke_editmode_curve_poll(bContext *C)
-{
-  bGPdata *gpd = CTX_data_gpencil_data(C);
-  return (GPENCIL_EDIT_MODE(gpd) && GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd));
-}
-
 /* Poll callback for stroke painting mode */
 static bool gpencil_stroke_paintmode_poll(bContext *C)
 {
@@ -322,15 +315,6 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
   keymap->poll = gpencil_stroke_editmode_poll;
 }
 
-/* Stroke Curve Editing Keymap - Only when editmode is enabled and in curve edit mode */
-static void ed_keymap_gpencil_curve_editing(wmKeyConfig *keyconf)
-{
-  wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Curve Edit Mode", 0, 0);
-
-  /* set poll callback - so that this keymap only gets enabled when curve editmode is enabled */
-  keymap->poll = gpencil_stroke_editmode_curve_poll;
-}
-
 /* keys for draw with a drawing brush (no fill) */
 static void ed_keymap_gpencil_painting_draw(wmKeyConfig *keyconf)
 {
@@ -487,7 +471,6 @@ static void ed_keymap_gpencil_weightpainting_draw(wmKeyConfig *keyconf)
 void ED_keymap_gpencil(wmKeyConfig *keyconf)
 {
   ed_keymap_gpencil_general(keyconf);
-  ed_keymap_gpencil_curve_editing(keyconf);
   ed_keymap_gpencil_editing(keyconf);
   ed_keymap_gpencil_painting(keyconf);
   ed_keymap_gpencil_painting_draw(keyconf);
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 08411622df9..f1f6094dc62 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -196,15 +196,13 @@ static void rna_GPencil_stroke_curve_update(Main *bmain, Scene *scene, PointerRN
 {
   bGPdata *gpd = (bGPdata *)ptr->owner_id;
 
-  if (GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) {
-    LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
-      if (gpl->actframe != NULL) {
-        bGPDframe *gpf = gpl->actframe;
-        LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
-          if (gps->editcurve != NULL) {
-            gps->flag |= GP_STROKE_NEEDS_CURVE_UPDATE;
-            BKE_gpencil_stroke_geometry_update(gpd, gps);
-          }
+  LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
+    if (gpl->actframe != NULL) {
+      bGPDframe *gpf = gpl->actframe;
+      LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
+        if (gps->editcurve != NULL) {
+          gps->flag |= GP_STROKE_NEEDS_CURVE_UPDATE;
+          BKE_gpencil_stroke_geometry_update(gpd, gps);
         }
       }
     }
@@ -213,26 +211,6 @@ static void rna_GPencil_stroke_curve_update(Main *bmain, Scene *scene, PointerRN
   rna_GPencil_update(bmain, scene, ptr);
 }
 
-static void rna_GPencil_stroke_curve_resolution_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) {
-      if (gpl->actframe != NULL) {
-        bGPDframe *gpf = gpl->actframe;
-        LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
-          if (gps->editcurve != NULL) {
-            gps->flag |= GP_STROKE_NEEDS_CURVE_UPDATE;
-            BKE_gpencil_stroke_geometry_update(gpd, gps);
-          }
-        }
-      }
-    }
-  }
-  rna_GPencil_update(bmain, scene, ptr);
-}
-
 static void rna_GPencil_dependency_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
 {
   DEG_id_tag_update(ptr->owner_id, ID_RECALC_TRANSFORM);
@@ -2397,7 +2375,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
       "Curve Resolution",
       "Number of segments generated between control points when editing strokes in curve mode");
   RNA_def_property_update(
-      prop, NC_GPENCIL | ND_DATA, "rna_GPencil_stroke_curve_resolution_update");
+      prop, NC_GPENCIL | ND_DATA, "rna_GPencil_stroke_curve_update");
 
   prop = RNA_def_property(srna, "use_adaptive_curve_resolution", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_CURVE_ADAPTIVE_RESOLUTION);
@@ -2408,7 +2386,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
                            "the length of the segment. The resolution is the number of points "
                            "generated per unit distance");
   RNA_def_property_update(
-      prop, NC_GPENCIL | ND_DATA, "rna_GPencil_stroke_curve_resolution_update");
+      prop, NC_GPENCIL | ND_DATA, "rna_GPencil_stroke_curve_update");
 
   /* Curve editing error threshold. */
   prop = RNA_def_property(srna, "curve_edit_threshold", PROP_FLOAT, PROP_FACTOR);