diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-09 21:47:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-11-09 23:00:53 +0300 |
| commit | 865796375bcfa6be4288cca4243dddcb4092f70b (patch) | |
| tree | 5264d4b9b0f9d392b6e1b942e0f6fd802de1fff4 /source/blender/editors/space_image/image_ops.c | |
| parent | cf959a879eb5ffbdfa573c5f3a00965e69d7a976 (diff) | |
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library.
We have callbacks for that, they also do some checks and help ensure things are done
correctly. Only place where this is assumed not true is blenloader (since here we
may affect refcount of library IDs as well...).
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index ab062eb133b..a07d274b69b 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1169,7 +1169,7 @@ static int image_open_exec(bContext *C, wmOperator *op) if (iod->pprop.prop) { /* when creating new ID blocks, use is already 1, but RNA * pointer se also increases user, so this compensates it */ - ima->id.us--; + id_us_min(&ima->id); if ((frame_seq_len > 1) && ima->source == IMA_SRC_FILE) { ima->source = IMA_SRC_SEQUENCE; } @@ -2276,7 +2276,7 @@ static int image_new_exec(bContext *C, wmOperator *op) if (prop) { /* when creating new ID blocks, use is already 1, but RNA * pointer se also increases user, so this compensates it */ - ima->id.us--; + id_us_min(&ima->id); RNA_id_pointer_create(&ima->id, &idptr); RNA_property_pointer_set(&ptr, prop, idptr); |