From 1e096852bf38f8d7b9bdb93d9a5f1e585b87db05 Mon Sep 17 00:00:00 2001 From: Thomas Beck Date: Sun, 24 Nov 2013 13:54:47 +0100 Subject: Commit D31 : Check if the user count needs to be decreased after adding a new BI image texture. Fixes this problem: *Go to the Blender (BI) textures tab and open an existing image. *Hit on the plus sign next to datablock to create a new image. *Complete the creation process and switch back to the first (loaded) image. -> The image user count raises... will raise as often as you hit the plus sign --- source/blender/editors/space_image/image_ops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index b7d3407b826..58d835b0d2f 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1792,7 +1792,9 @@ static int image_new_exec(bContext *C, wmOperator *op) else { Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data; if (tex && tex->type == TEX_IMAGE) { - tex->ima = ima; + if (tex->ima) + tex->ima->id.us--; /* Decrease the previous image users count by 1 */ + tex->ima = ima; /* Assign the new image */ ED_area_tag_redraw(CTX_wm_area(C)); } } -- cgit v1.2.3