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>2014-02-22 18:02:49 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-02-22 18:02:49 +0400
commitf469cbea9df6a00aa5f406c2b0fa311c81c8b738 (patch)
tree2a111369d047188fcbf4e6ec11585d719c05a845 /source/blender/editors/util/numinput.c
parent554eca1c288ea5b6c02b7fb174bf20238918b809 (diff)
Followup for numinput: activate numinput when hitting pad* or =, this is the expected behavior from users!
Diffstat (limited to 'source/blender/editors/util/numinput.c')
-rw-r--r--source/blender/editors/util/numinput.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c
index 42604338ef4..9cbea14d10a 100644
--- a/source/blender/editors/util/numinput.c
+++ b/source/blender/editors/util/numinput.c
@@ -48,6 +48,12 @@
#include "UI_interface.h"
+/* NumInput.flag */
+enum {
+ /* (1 << 8) and below are reserved for public flags! */
+ NUM_EDIT_FULL = (1 << 9), /* Enable full editing, with units and math operators support. */
+};
+
/* NumInput.val_flag[] */
enum {
/* (1 << 8) and below are reserved for public flags! */
@@ -55,7 +61,6 @@ enum {
NUM_INVALID = (1 << 10), /* Current expression for this value is invalid. */
NUM_NEGATE = (1 << 11), /* Current expression's result has to be negated. */
NUM_INVERSE = (1 << 12), /* Current expression's result has to be inverted. */
- NUM_EDIT_FULL = (1 << 13), /* Enable full editing, with units and math operators support. */
};
/* ************************** Functions *************************** */
@@ -337,6 +342,7 @@ bool handleNumInput(bContext *C, NumInput *n, const wmEvent *event)
case PADASTERKEY:
if (!(n->flag & NUM_EDIT_FULL)) {
n->flag |= NUM_EDIT_FULL;
+ n->val_flag[idx] |= NUM_EDITED;
return true;
}
else if (event->ctrl) {