Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2022-09-25 13:26:48 +0300
committerAntonio Vazquez <blendergit@gmail.com>2022-09-25 13:26:59 +0300
commitb6adca32801044b93d55091593901a33557e01eb (patch)
treef25983a16b40fcc1f36c89983e2fcc08e529350c /source/blender/editors
parentf68cfd6bb078482c4a779a6e26a56e2734edb5b8 (diff)
Fix T101317: GPencil separate Active layer freezes blender
The error occurs only when the layer is empty.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/gpencil/gpencil_edit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 837a9390b6c..1af5916c5fe 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -5221,7 +5221,9 @@ static int gpencil_stroke_separate_exec(bContext *C, wmOperator *op)
for (int slot = 1; slot <= ob_dst->totcol; slot++) {
while (slot <= ob_dst->totcol && !BKE_object_material_slot_used(ob_dst, slot)) {
ob_dst->actcol = slot;
- BKE_object_material_slot_remove(bmain, ob_dst);
+ if (!BKE_object_material_slot_remove(bmain, ob_dst)) {
+ break;
+ }
if (actcol >= slot) {
actcol--;
}