[Bf-blender-cvs] [803d9f97487] blender-v3.3-release: Fix T101317: GPencil separate Active layer freezes blender
Antonio Vazquez
noreply at git.blender.org
Fri Sep 30 14:39:55 CEST 2022
Commit: 803d9f974876303e3c6c4a32743589c2efe10127
Author: Antonio Vazquez
Date: Sun Sep 25 12:26:48 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB803d9f974876303e3c6c4a32743589c2efe10127
Fix T101317: GPencil separate Active layer freezes blender
The error occurs only when the layer is empty.
===================================================================
M source/blender/editors/gpencil/gpencil_edit.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 1e666f8c1dd..4e91e27e78e 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -4820,7 +4820,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--;
}
More information about the Bf-blender-cvs
mailing list