[Bf-blender-cvs] [1e09685] master: Commit D31 : Check if the user count needs to be decreased after adding a new BI image texture.
Thomas Beck
noreply at git.blender.org
Sun Nov 24 14:07:20 CET 2013
Commit: 1e096852bf38f8d7b9bdb93d9a5f1e585b87db05
Author: Thomas Beck
Date: Sun Nov 24 13:54:47 2013 +0100
http://developer.blender.org/rB1e096852bf38f8d7b9bdb93d9a5f1e585b87db05
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
===================================================================
M source/blender/editors/space_image/image_ops.c
===================================================================
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index b7d3407..58d835b 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));
}
}
More information about the Bf-blender-cvs
mailing list