diff options
-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 | ||||
-rw-r--r-- | source/blender/src/drawaction.c | 1 | ||||
-rw-r--r-- | source/blender/src/drawimage.c | 1 | ||||
-rw-r--r-- | source/blender/src/drawimasel.c | 1 | ||||
-rw-r--r-- | source/blender/src/drawnla.c | 1 | ||||
-rw-r--r-- | source/blender/src/drawoops.c | 1 | ||||
-rw-r--r-- | source/blender/src/drawtime.c | 1 | ||||
-rw-r--r-- | source/blender/src/drawview.c | 1 | ||||
-rw-r--r-- | source/blender/src/editscreen.c | 1 | ||||
-rw-r--r-- | source/blender/src/interface_icons.c | 5 | ||||
-rw-r--r-- | source/blender/src/previewrender.c | 3 |
13 files changed, 11 insertions, 10 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; } diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index 859760c7d03..3fa263ffb89 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -68,6 +68,7 @@ #include "BIF_editaction.h" #include "BIF_editkey.h" #include "BIF_interface.h" +#include "BIF_interface_icons.h" #include "BIF_gl.h" #include "BIF_glutil.h" #include "BIF_resources.h" diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 01702cf9ffe..8364424674b 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -77,6 +77,7 @@ #include "BIF_drawimage.h" #include "BIF_resources.h" #include "BIF_interface.h" +#include "BIF_interface_icons.h" #include "BIF_editsima.h" #include "BIF_glutil.h" #include "BIF_space.h" diff --git a/source/blender/src/drawimasel.c b/source/blender/src/drawimasel.c index 82327877f38..83649aa839f 100644 --- a/source/blender/src/drawimasel.c +++ b/source/blender/src/drawimasel.c @@ -59,6 +59,7 @@ #include "BIF_resources.h" #include "BIF_screen.h" #include "BIF_interface.h" +#include "BIF_interface_icons.h" #include "BIF_imasel.h" #include "BIF_mywindow.h" #include "BIF_space.h" diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index 20a61ca21dd..e3436645adc 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -70,6 +70,7 @@ #include "BIF_gl.h" #include "BIF_glutil.h" #include "BIF_interface.h" +#include "BIF_interface_icons.h" #include "BIF_mywindow.h" #include "BIF_resources.h" #include "BIF_screen.h" diff --git a/source/blender/src/drawoops.c b/source/blender/src/drawoops.c index 2848b194e46..0fc22ceea91 100644 --- a/source/blender/src/drawoops.c +++ b/source/blender/src/drawoops.c @@ -55,6 +55,7 @@ #include "BKE_global.h" #include "BIF_interface.h" +#include "BIF_interface_icons.h" #include "BIF_gl.h" #include "BIF_glutil.h" #include "BIF_mywindow.h" diff --git a/source/blender/src/drawtime.c b/source/blender/src/drawtime.c index e2c13186ffc..7ad6c492c5b 100644 --- a/source/blender/src/drawtime.c +++ b/source/blender/src/drawtime.c @@ -53,6 +53,7 @@ #include "BKE_global.h" #include "BIF_gl.h" +#include "BIF_interface_icons.h" #include "BIF_mywindow.h" #include "BIF_screen.h" #include "BIF_resources.h" diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 0360183fa4f..03c8d62b25d 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -102,6 +102,7 @@ #include "BIF_gl.h" #include "BIF_glutil.h" #include "BIF_interface.h" +#include "BIF_interface_icons.h" #include "BIF_mywindow.h" #include "BIF_poseobject.h" #include "BIF_resources.h" diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index b357c8b9376..299eaf3b0df 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -78,6 +78,7 @@ #include "BIF_gl.h" #include "BIF_graphics.h" #include "BIF_interface.h" +#include "BIF_interface_icons.h" #include "BIF_mainqueue.h" #include "BIF_mywindow.h" #include "BIF_renderwin.h" diff --git a/source/blender/src/interface_icons.c b/source/blender/src/interface_icons.c index ff59804751d..84ed6f8f29e 100644 --- a/source/blender/src/interface_icons.c +++ b/source/blender/src/interface_icons.c @@ -612,7 +612,6 @@ int BIF_icon_get_height(int icon_id) void BIF_icons_init(int first_dyn_id) { - DrawInfo* di; BKE_icons_init(first_dyn_id); init_internal_icons(); @@ -622,9 +621,7 @@ void BIF_icons_init(int first_dyn_id) /* only call with valid pointer from BIF_icon_draw */ static void icon_set_image(ID* id, DrawInfo* di) { - ImBuf* ima = 0; RenderInfo ri; - int it; if (!di) return; @@ -664,7 +661,6 @@ void BIF_icon_draw( int x, int y, int icon_id) { Icon* icon = 0; DrawInfo* di = 0; - int pr_size = 0; ImBuf *ima; @@ -717,7 +713,6 @@ void BIF_icon_draw( int x, int y, int icon_id) void BIF_icon_draw_blended(int x, int y, int icon_id, int colorid, int shade) { - int done; if(shade < 0) { float r= (128+shade)/128.0; diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c index 82fa6d2de0b..650f4c87a58 100644 --- a/source/blender/src/previewrender.c +++ b/source/blender/src/previewrender.c @@ -68,6 +68,7 @@ #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_icons.h" #include "BKE_texture.h" #include "BKE_material.h" #include "BKE_world.h" @@ -409,7 +410,6 @@ void BIF_previewdraw(void) if (sbuts->ri->rect==0) BIF_preview_changed(sbuts); else { - int y; BIF_set_previewrect(sbuts->area->win, PR_XMIN, PR_YMIN, PR_XMAX, PR_YMAX, sbuts->ri->pr_rectx, sbuts->ri->pr_recty); BIF_previewdraw_render(sbuts->ri, sbuts->area); BIF_end_previewrect(); @@ -1283,7 +1283,6 @@ void BIF_previewrender(struct ID* id, struct RenderInfo *ri, struct ScrArea *are float lens = 0.0, vec[3]; int x, y, starty, startx, endy, endx, radsq, xsq, ysq, last = 0; unsigned int *rect; - Link* li; if(ri->cury>=ri->pr_rectx) return; |