diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-05-30 17:03:08 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-05-30 17:58:27 +0300 |
| commit | e7544e3ce4066cfb1759477a7cc4e405b6969067 (patch) | |
| tree | e2fb73224242743bafd0f8247992ad6a289836bd | |
| parent | c1277c5d25028ab2a09afc174ae4518d5f8e2b9e (diff) | |
Fix (unreported) wrong ID usercount handling in background images removal.
Assuming that an ID pointer is NULL because another 'source type'
property has some specific value is utterly wrong and a gateway to
usercounting bugs.
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 9f8d7afd9a8..922ebe2f0f4 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -631,12 +631,8 @@ static int background_image_remove_exec(bContext *C, wmOperator *op) CameraBGImage *bgpic_rem = BLI_findlink(&cam->bg_images, index); if (bgpic_rem) { - if (bgpic_rem->source == CAM_BGIMG_SOURCE_IMAGE) { - id_us_min((ID *)bgpic_rem->ima); - } - else if (bgpic_rem->source == CAM_BGIMG_SOURCE_MOVIE) { - id_us_min((ID *)bgpic_rem->clip); - } + id_us_min((ID *)bgpic_rem->ima); + id_us_min((ID *)bgpic_rem->clip); BKE_camera_background_image_remove(cam, bgpic_rem); |