diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-22 02:39:20 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-22 02:39:20 +0300 |
commit | 17210112a18c67bcbf24217625153a37bb7b4801 (patch) | |
tree | 5ef32a0097738f0f69ffdfa73dc918a937e86c99 /source/blender/blenkernel | |
parent | 80eb4d3b9e851c19638599b1821a083dc5a2f635 (diff) |
Orange: Warning cleanup for Icons commit, missing declarations of some
calls caused icon hashing not to work too. Runs smooth here :)
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/icons.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index ca0a81b063c..9617902e057 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -188,7 +188,6 @@ void BKE_icon_set(int icon_id, struct Icon* icon) void BKE_icon_delete(struct ID* id) { - Icon* new_icon = 0; if (!id->icon_id) return; /* no icon defined for library object */ diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 151f818250d..fa4136d63fa 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -104,7 +104,7 @@ void free_image(Image *ima) freePackedFile(ima->packedfile); ima->packedfile = NULL; } - BKE_icon_delete(ima); + BKE_icon_delete(&ima->id); ima->id.icon_id = 0; } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 49b73cff77c..2b0111163b3 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -676,7 +676,7 @@ void free_lamp(Lamp *la) } la->ipo= 0; - BKE_icon_delete(la); + BKE_icon_delete(&la->id); la->id.icon_id = 0; } |