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>2014-02-13 02:36:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-13 02:37:28 +0400
commit4c21e2b3825ef21e29f179584109a7974a185f3d (patch)
tree3f3b990acedfd0d69119e51931d2517fea469868 /source/blender/editors/interface/interface_intern.h
parentd4c87f2f79b674963a73ceee154226a1cd6d2acc (diff)
UI: split ui_popup_menu_memory into get/set functions and store as uint
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
-rw-r--r--source/blender/editors/interface/interface_intern.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index d3378af3de7..29f56192eb2 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -293,7 +293,7 @@ struct uiBlock {
rctf rect;
float aspect;
- int puphash; /* popup menu hash for memory */
+ unsigned int puphash; /* popup menu hash for memory */
uiButHandleFunc func;
void *func_arg1;
@@ -466,7 +466,8 @@ uiBlock *ui_block_func_COLOR(struct bContext *C, uiPopupBlockHandle *handle, voi
struct ARegion *ui_tooltip_create(struct bContext *C, struct ARegion *butregion, uiBut *but);
void ui_tooltip_free(struct bContext *C, struct ARegion *ar);
-uiBut *ui_popup_menu_memory(struct uiBlock *block, struct uiBut *but);
+uiBut *ui_popup_menu_memory_get(struct uiBlock *block);
+void ui_popup_menu_memory_set(struct uiBlock *block, struct uiBut *but);
float *ui_block_hsv_get(struct uiBlock *block);
void ui_popup_block_scrolltest(struct uiBlock *block);