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:
authorBastien Montagne <montagne29@wanadoo.fr>2016-01-15 17:19:14 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-01-15 17:19:14 +0300
commit9137a4401440d3f3206e989f49f3539079d685b8 (patch)
tree90676cf31f7de0914a8b8719b43ef886576a07dd
parent7776f03873e47c2327d1d2fdb980a12cb99407de (diff)
Fix T47185: Wrong items order with template_icon_view.
-rw-r--r--source/blender/editors/interface/interface_templates.c4
1 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 bda84fe6c03..ccb0c9f508d 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1636,7 +1636,7 @@ static uiBlock *ui_icon_view_menu_cb(bContext *C, ARegion *ar, void *arg_litem)
h = UI_UNIT_X * (args.icon_scale + args.show_labels);
block = UI_block_begin(C, ar, "_popup", UI_EMBOSS_PULLDOWN);
- UI_block_flag_enable(block, UI_BLOCK_LOOP);
+ UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_NO_FLIP);
RNA_property_enum_items(C, &args.ptr, args.prop, &item, NULL, &free);
@@ -1644,7 +1644,7 @@ static uiBlock *ui_icon_view_menu_cb(bContext *C, ARegion *ar, void *arg_litem)
int x, y;
x = (a % 8) * w;
- y = (a / 8) * h;
+ y = -(a / 8) * h;
icon = item[a].icon;
value = item[a].value;