diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-09-17 09:58:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-17 09:58:06 +0400 |
commit | e546d7666b753480995dc54c0cf68a3011dd28f0 (patch) | |
tree | 006c822d9c4bd9133636aa11dc0964eeb25aa7b3 /source/blender/editors/include/UI_interface.h | |
parent | 5ae75d5dc841a6fa33b8ead55bc6fbe89bb8b767 (diff) |
minor changes needed for the next commit.
- BKE_add_image_extension now sets the extension rather then appending. (no more image.jpg.tga)
- py/rna functions which have no return value now raise an error if a non-None value is returned.
- added back the red-alert flag so buttons can have a red highlight if somethings wrong.
Diffstat (limited to 'source/blender/editors/include/UI_interface.h')
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 1c79a621ecc..7d56698f7b9 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -146,15 +146,16 @@ typedef struct uiLayout uiLayout; #define UI_BUT_ANIMATED (1<<20) #define UI_BUT_ANIMATED_KEY (1<<21) #define UI_BUT_DRIVEN (1<<22) -#define UI_BUT_INACTIVE (1<<23) -#define UI_BUT_LAST_ACTIVE (1<<24) -#define UI_BUT_UNDO (1<<25) -#define UI_BUT_IMMEDIATE (1<<26) -#define UI_BUT_NO_TOOLTIP (1<<27) -#define UI_BUT_NO_UTF8 (1<<28) - -#define UI_BUT_VEC_SIZE_LOCK (1<<29) /* used to flag if color hsv-circle should keep luminance */ -#define UI_BUT_COLOR_CUBIC (1<<30) /* cubic saturation for the color wheel */ +#define UI_BUT_REDALERT (1<<23) +#define UI_BUT_INACTIVE (1<<24) +#define UI_BUT_LAST_ACTIVE (1<<25) +#define UI_BUT_UNDO (1<<26) +#define UI_BUT_IMMEDIATE (1<<27) +#define UI_BUT_NO_TOOLTIP (1<<28) +#define UI_BUT_NO_UTF8 (1<<29) + +#define UI_BUT_VEC_SIZE_LOCK (1<<30) /* used to flag if color hsv-circle should keep luminance */ +#define UI_BUT_COLOR_CUBIC (1<<31) /* cubic saturation for the color wheel */ #define UI_PANEL_WIDTH 340 #define UI_COMPACT_PANEL_WIDTH 160 |