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>2010-10-13 17:53:49 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-13 17:53:49 +0400
commit843d8859a718c1f9a8c0f7109b2cdf9bbeb46fa3 (patch)
tree84832487219a9d9b7b495ade9efb4e7b925cd917 /source/blender/editors/interface/interface_intern.h
parent62f4d613d06fad1bad95b4ec5e5199425a23d684 (diff)
bugfix [#23355] Square Color picker moving by itself and locking up
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
-rw-r--r--source/blender/editors/interface/interface_intern.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index eb28df54b13..8183617a9ba 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -171,8 +171,9 @@ struct uiBut {
char *poin;
float hardmin, hardmax, softmin, softmax;
- float a1, a2, hsv[3]; // hsv is temp memory for hsv buttons
+ float a1, a2;
float aspect;
+ char col[4];
uiButHandleFunc func;
void *func_arg1;
@@ -396,7 +397,7 @@ struct uiPopupBlockHandle {
int butretval;
int menuretval;
float retvalue;
- float retvec[4];
+ float retvec[8];
};
uiBlock *ui_block_func_COL(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but);
@@ -408,6 +409,8 @@ void ui_tooltip_free(struct bContext *C, struct ARegion *ar);
uiBut *ui_popup_menu_memory(uiBlock *block, uiBut *but);
+float *ui_block_hsv_get(uiBlock *block);
+
/* searchbox for string button */
ARegion *ui_searchbox_create(struct bContext *C, struct ARegion *butregion, uiBut *but);
int ui_searchbox_inside(struct ARegion *ar, int x, int y);