Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-23 02:01:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-23 09:40:55 +0300
commit64ab45213166b62d177e4e0f831a0b84ec2c463b (patch)
tree67f22f9a7054c355fdfb5716641d437976d76508 /source/blender/editors/interface/interface.c
parent48b1656a6cce6fd7606a671eea9d0d17b67d7445 (diff)
Cleanup: shadowing (interface)
Diffstat (limited to 'source/blender/editors/interface/interface.c')
-rw-r--r--source/blender/editors/interface/interface.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 8199ce038ed..5ad8acb46ab 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2827,10 +2827,11 @@ void ui_but_update(uiBut *but)
/* only needed for menus in popup blocks that don't recreate buttons on redraw */
if (but->block->flag & UI_BLOCK_LOOP) {
if (but->rnaprop && (RNA_property_type(but->rnaprop) == PROP_ENUM)) {
- int value = RNA_property_enum_get(&but->rnapoin, but->rnaprop);
+ int value_enum = RNA_property_enum_get(&but->rnapoin, but->rnaprop);
const char *buf;
- if (RNA_property_enum_name_gettexted(but->block->evil_C,
- &but->rnapoin, but->rnaprop, value, &buf))
+ if (RNA_property_enum_name_gettexted(
+ but->block->evil_C,
+ &but->rnapoin, but->rnaprop, value_enum, &buf))
{
size_t slen = strlen(buf);
ui_but_string_free_internal(but);