diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-13 18:02:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-13 18:02:21 +0300 |
| commit | 59f1640ae5f53e2360fec2634fdc7d2ec85e2989 (patch) | |
| tree | f2f36528a67424b74f3cf305643d04cd64782284 /source/blender/editors/gpencil/gpencil_buttons.c | |
| parent | 0852278ce76fe7412344eeb7e577d0dbdab0ff75 (diff) | |
warning cleanup.
- fix mistake with grease pencil UI (&& was intended but & used).
- use (void) rather then () across _all_ blenders code.
- a few minor edits, don't shadow stack variables in roll calculation & avoid running memset() for VBO vertex map.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_buttons.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_buttons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index 96bc4259661..7590b2558f0 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -141,7 +141,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) uiItemL(subrow, name, ICON_NULL); /* delete button (only if hidden but not locked!) */ - if ((gpl->flag & GP_LAYER_HIDE) & !(gpl->flag & GP_LAYER_LOCKED)) { + if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED)) { /* right-align ............................... */ subrow= uiLayoutRow(row, 1); uiLayoutSetAlignment(subrow, UI_LAYOUT_ALIGN_RIGHT); |