From 2a36b613caff7e6bc27d47cfdd0bc025df9b7eb4 Mon Sep 17 00:00:00 2001
From: Philipp Oeser <philipp@blender.org>
Date: Tue, 8 Apr 2025 12:13:23 +0200
Subject: [PATCH] Fix #137135: Grease Pencil Join not reporting non-active
 layer

Reported because this operator relies on an active layer, now report an error if this is
not the case.

Pull Request: https://projects.blender.org/blender/blender/pulls/137138
---
 .../grease_pencil/intern/grease_pencil_join_selection.cc        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_join_selection.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_join_selection.cc
index 1a626d04ac9..9c39b840446 100644
--- a/source/blender/editors/grease_pencil/intern/grease_pencil_join_selection.cc
+++ b/source/blender/editors/grease_pencil/intern/grease_pencil_join_selection.cc
@@ -9,6 +9,7 @@
 #include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_grease_pencil.hh"
+#include "BKE_report.hh"
 
 #include "DNA_scene_types.h"
 
@@ -433,6 +434,7 @@ wmOperatorStatus grease_pencil_join_selection_exec(bContext *C, wmOperator *op)
       scene->toolsettings, object);
   GreasePencil &grease_pencil = *static_cast<GreasePencil *>(object->data);
   if (!grease_pencil.has_active_layer()) {
+    BKE_report(op->reports, RPT_ERROR, "No active layer");
     return OPERATOR_CANCELLED;
   }