diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-29 08:45:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-29 08:45:40 +0400 |
| commit | 33a9cb6caa27aff13942fdea5e95cb9ac8ee74df (patch) | |
| tree | c63056e0978b4729c5ba86aac39e56cfa6d0f554 /source/blender/editors | |
| parent | a25f00301f63fb61e830199df62beb2fa1999013 (diff) | |
minor changes for confusing code.
- memset() was argument was truncated.
- outliner had redundant NULL check.
- node texture was allocating memory to make a unique name which isnt needed for a fixed size string.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 8da66c114d5..4bd8a7d426a 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -964,7 +964,7 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat br->icon_imbuf = get_brush_icon(br); - memset(sp->pr_rect, 0x888888, sp->sizex * sp->sizey * sizeof(unsigned int)); + memset(sp->pr_rect, 0x88, sp->sizex * sp->sizey * sizeof(unsigned int)); if (!(br->icon_imbuf) || !(br->icon_imbuf->rect)) return; diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index eb33d799dff..cf99254e8bb 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1131,7 +1131,7 @@ static int need_add_seq_dup(Sequence *seq) { Sequence *p; - if ((!seq->strip) || (!seq->strip->stripdata) || (!seq->strip->stripdata->name)) + if ((!seq->strip) || (!seq->strip->stripdata)) return(1); /* |