diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 02:01:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:55 +0300 |
| commit | 64ab45213166b62d177e4e0f831a0b84ec2c463b (patch) | |
| tree | 67f22f9a7054c355fdfb5716641d437976d76508 /source/blender/editors/interface/interface_templates.c | |
| parent | 48b1656a6cce6fd7606a671eea9d0d17b67d7445 (diff) | |
Cleanup: shadowing (interface)
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index c606dd67f29..09422a0ebd3 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2418,15 +2418,15 @@ void uiTemplatePalette(uiLayout *layout, PointerRNA *ptr, const char *propname, uiLayoutRow(col, true); for (; color; color = color->next) { - PointerRNA ptr; + PointerRNA color_ptr; if (row_cols >= cols_per_row) { uiLayoutRow(col, true); row_cols = 0; } - RNA_pointer_create(&palette->id, &RNA_PaletteColor, color, &ptr); - uiDefButR(block, UI_BTYPE_COLOR, 0, "", 0, 0, UI_UNIT_X, UI_UNIT_Y, &ptr, "color", -1, 0.0, 1.0, + RNA_pointer_create(&palette->id, &RNA_PaletteColor, color, &color_ptr); + uiDefButR(block, UI_BTYPE_COLOR, 0, "", 0, 0, UI_UNIT_X, UI_UNIT_Y, &color_ptr, "color", -1, 0.0, 1.0, UI_PALETTE_COLOR, col_id, ""); row_cols++; col_id++; |