diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-14 10:17:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-14 10:17:14 +0400 |
| commit | 7a71f58af3b5f70e8982d827d1fef7e8bc4e4ec8 (patch) | |
| tree | ae5ee3e8c3a1d029e54531bbfd5ac8db42d9f7d9 /source/blender/editors/interface | |
| parent | 3957efdd38d0d5136f8d106de3a79e07b7b0b15f (diff) | |
fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index e825ff7880d..f6f12f98181 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -835,7 +835,7 @@ static void icon_create_rect(struct PreviewImage *prv_img, enum eIconSizes size) if (G.debug & G_DEBUG) printf("%s, error: requested preview image does not exist", __func__); } - if (!prv_img->rect[size]) { + else if (!prv_img->rect[size]) { prv_img->w[size] = render_size; prv_img->h[size] = render_size; prv_img->changed[size] = 1; diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index ed6b2e00119..b379a2e7b4c 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -944,7 +944,7 @@ void UI_SetTheme(int spacetype, int regionid) } } -bTheme *UI_GetTheme() +bTheme *UI_GetTheme(void) { return U.themes.first; } |