diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-06-30 19:54:45 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-06-30 21:37:36 +0400 |
| commit | 320b7a59c3eed976328544bb401527f9b43d6987 (patch) | |
| tree | 74066d9eb5b57f7a3c459c819cb53304a4cacdb8 | |
| parent | a51aeedade2d0620d8509602ab04c2ec00e06053 (diff) | |
Fix image user count not being decreased when deleting a 3DView background image.
Patch by julien (Julien DUROURE) as T40568 (with own minor style edits), many thanks!
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index cc4aca91318..aedbca4b8cd 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -4265,6 +4265,19 @@ static int background_image_remove_exec(bContext *C, wmOperator *op) if (bgpic_rem) { ED_view3D_background_image_remove(v3d, bgpic_rem); + + if (bgpic_rem->source == V3D_BGPIC_IMAGE) { + Image *ima = bgpic_rem->ima; + if (ima) { + id_us_min(&ima->id); + } + } + else if (bgpic_rem->source == V3D_BGPIC_MOVIE) { + MovieClip *clip = bgpic_rem->clip; + if (clip) { + id_us_min(&clip->id); + } + } WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); return OPERATOR_FINISHED; } |