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:
authorPhilipp Oeser <info@graphics-engineer.com>2020-07-30 14:02:29 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-07-30 14:02:29 +0300
commit3eff2b44db405adb3a6fdd6b156dfcc5a8bacf58 (patch)
tree1e7f9e654b162a404ca5c03edddacd13dfa648a7
parent742ad5acbc01bf0ad7e25e37ea2e1c10e2dbc53e (diff)
parent4251a87bf60eece32ae9ff7a7c481f029a1d2d84 (diff)
Merge branch 'blender-v2.90-release'
-rw-r--r--source/blender/editors/gpencil/gpencil_edit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 7b3cb08c6d5..29ae38fdbd8 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -4290,8 +4290,11 @@ static int gpencil_stroke_separate_exec(bContext *C, wmOperator *op)
base_new = ED_object_add_duplicate(bmain, scene, view_layer, base_prev, dupflag);
ob_dst = base_new->object;
ob_dst->mode = OB_MODE_OBJECT;
- /* create new grease pencil datablock */
+ /* Duplication will increment bGPdata usercount, but since we create a new greasepencil datablock
+ * for ob_dst (which gets its own user automatically), we have to decrement the usercount again.
+ */
gpd_dst = BKE_gpencil_data_addnew(bmain, gpd_src->id.name + 2);
+ id_us_min(ob_dst->data);
ob_dst->data = (bGPdata *)gpd_dst;
/* loop old datablock and separate parts */