@@ -74,0 +77,4 @@
+  BLI_assert((ked != nullptr));
+  CfraElem *ce;
+
+  ce = static_cast<CfraElem *>(MEM_callocN(sizeof(CfraElem), "CfraElem"));

@@ -70,6 +70,28 @@ bool layer_has_any_frame_selected(const bke::greasepencil::Layer *layer)
   return false;
 }
 
+static void frame_to_cfraelem(KeyframeEditData *ked, const int frame_number)

@@ -72,1 +72,4 @@
 
+static void frame_to_cfraelem(KeyframeEditData *ked,
+                              const int frame_number,
+                              const GreasePencilFrame &frame)

@@ -73,0 +75,4 @@
+                              const GreasePencilFrame &frame)
+{
+  BLI_assert((ked != nullptr));
+  CfraElem *ce;

@@ -73,0 +81,4 @@
+  ce->cfra = float(frame_number);
+  ce->sel = frame.is_selected();
+  BLI_addtail(&(ked->list), ce);
+}

@@ -73,0 +83,4 @@
+  BLI_addtail(&(ked->list), ce);
+}
+
+void make_cfralist_selected_frames(KeyframeEditData *ked, const bke::greasepencil::Layer *layer)

@@ -1081,3 +1081,3 @@
 
         for (ale = static_cast<bAnimListElem *>(anim_data.first); ale; ale = ale->next) {
-          ED_gpencil_layer_make_cfra_list(static_cast<bGPDlayer *>(ale->data), &ked.list, true);
+          if (U.experimental.use_grease_pencil_version3) {

@@ -73,0 +86,4 @@
+  BLI_assert(ked != nullptr);
+
+  for (const auto &[frame_number, frame] : layer->frames().items()) {
+    if (frame.is_selected()) {

@@ -1084,0 +1091,4 @@
+              break;
+            default:
+              /* Invalid channel type. */
+              BLI_assert(0);