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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-11-05 14:48:43 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-11-05 14:48:43 +0400
commit45b8a61bf39dade4efcad16c26324d1cb2e95d48 (patch)
tree50cee67fa57c73608a37435641282dc6fe64624b /source/blender/editors/gpencil/gpencil_edit.c
parent010cd66747b83cf34eeb87328fded1badc3e1a4a (diff)
Fix #29162: grease pencil did not decrement user count on adding new datablock
to replace an existing one.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_edit.c')
-rw-r--r--source/blender/editors/gpencil/gpencil_edit.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index c915bc9ea37..d481be94bcc 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -183,7 +183,10 @@ static int gp_data_add_exec (bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
else {
- /* just add new datablock now */
+ /* decrement user count and add new datablock */
+ bGPdata *gpd= (*gpd_ptr);
+
+ id_us_min(&gpd->id);
*gpd_ptr= gpencil_data_addnew("GPencil");
}
@@ -231,7 +234,7 @@ static int gp_data_unlink_exec (bContext *C, wmOperator *op)
/* just unlink datablock now, decreasing its user count */
bGPdata *gpd= (*gpd_ptr);
- gpd->id.us--;
+ id_us_min(&gpd->id);
*gpd_ptr= NULL;
}