diff options
author | Ton Roosendaal <ton@blender.org> | 2008-10-09 14:59:48 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-10-09 14:59:48 +0400 |
commit | 158d8022bcda55f9b2c8d2573c2a0d4d64e53a92 (patch) | |
tree | 46f07f1fd032a46ded8d5dae1695cd9039427ac7 /source/blender/src/buttons_shading.c | |
parent | 9ca5b78d1ad13a54f2649a7ed4287435c6727de6 (diff) |
Bugfix #8911
Image counter can be set to zero when unlinking images, whilst they can
be in use for texture. This is a temporary solution to prevent errors!
(Now image unlinking doesn't set zero users anymore)
Diffstat (limited to 'source/blender/src/buttons_shading.c')
-rw-r--r-- | source/blender/src/buttons_shading.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 056ecd5d36c..989684895c8 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -862,7 +862,9 @@ static void image_unlink_cb(void *ima_pp_v, void *unused) if(ima_pp && *ima_pp) { Image *ima= *ima_pp; - ima->id.us--; + /* (for time being, texturefaces are no users, conflict in design...) */ + if(ima->id.us>1) + ima->id.us--; *ima_pp= NULL; } } |