diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-06 22:35:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-06 22:35:55 +0400 |
| commit | 182179a44b09564603f424b8be75043578fd0c61 (patch) | |
| tree | 4466028b62070261ee4b92cc3a0c6f9db4304e99 /source/blender/editors | |
| parent | f300c158b92452d00c08ebcd0eb08ac23d28c69e (diff) | |
Cleanup: redundant NULL checks
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_time/space_time.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 72669d65f71..961c2d033d9 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -447,7 +447,7 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str /* text button with name */ if (id) { char name[UI_MAX_NAME_STR]; - const short user_alert = (id->us <= 0); + const bool user_alert = (id->us <= 0); //text_idbutton(id, name); name[0] = '\0'; diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index a363fae093b..2fd4b0bc21d 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -346,7 +346,7 @@ static void time_draw_keyframes(const bContext *C, ARegion *ar) * - don't try to do this when only drawing active/selected data keyframes, * since this can become quite slow */ - if (scene && onlysel == 0) { + if (onlysel == 0) { /* set draw color */ glColor3ub(0xDD, 0xA7, 0x00); time_draw_idblock_keyframes(v2d, (ID *)scene, onlysel); |