diff options
| author | Andrea Weikert <elubie@gmx.net> | 2011-03-13 20:20:52 +0300 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2011-03-13 20:20:52 +0300 |
| commit | 70340503d8edc108aa195b44d90489a3440679f0 (patch) | |
| tree | 729b3bd3d0462a28b9f106c3e054014e7f340ae5 /source/blender/editors/interface | |
| parent | 5f7126c96f7a7abbcb70c6f8df3af9d6a1b347c6 (diff) | |
fix mistake from commit rev. 33868. The variable icon was a pointer, not an integer icon id (ICON_NONE).
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 1c0da12fcbd..4a36f34d468 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -754,7 +754,7 @@ int UI_icon_get_width(int icon_id) icon = BKE_icon_get(icon_id); - if (icon==ICON_NONE) { + if (icon==NULL) { if (G.f & G_DEBUG) printf("UI_icon_get_width: Internal error, no icon for icon ID: %d\n", icon_id); return 0; @@ -779,7 +779,7 @@ int UI_icon_get_height(int icon_id) icon = BKE_icon_get(icon_id); - if (icon==ICON_NONE) { + if (icon==NULL) { if (G.f & G_DEBUG) printf("UI_icon_get_height: Internal error, no icon for icon ID: %d\n", icon_id); return 0; @@ -955,7 +955,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al icon = BKE_icon_get(icon_id); - if (icon==ICON_NONE) { + if (icon==NULL) { if (G.f & G_DEBUG) printf("icon_draw_mipmap: Internal error, no icon for icon ID: %d\n", icon_id); return; @@ -980,7 +980,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al di->data.vector.func((int)x, (int)y, ICON_DEFAULT_HEIGHT, ICON_DEFAULT_HEIGHT, 1.0f); } else if(di->type == ICON_TYPE_TEXTURE) { - icon_draw_texture(x, y, w, h, di->data.texture.x, di->data.texture.y, + icon_draw_texture(x, y, (float)w, (float)h, di->data.texture.x, di->data.texture.y, di->data.texture.w, di->data.texture.h, alpha, rgb); } else if(di->type == ICON_TYPE_BUFFER) { |