[Bf-blender-cvs] [320b7a5] master: Fix image user count not being decreased when deleting a 3DView background image.

Bastien Montagne noreply at git.blender.org
Mon Jun 30 19:38:07 CEST 2014


Commit: 320b7a59c3eed976328544bb401527f9b43d6987
Author: Bastien Montagne
Date:   Mon Jun 30 17:54:45 2014 +0200
https://developer.blender.org/rB320b7a59c3eed976328544bb401527f9b43d6987

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!

===================================================================

M	source/blender/editors/space_view3d/view3d_edit.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index cc4aca9..aedbca4 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;
 	}




More information about the Bf-blender-cvs mailing list