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:
authorAntony Riakiotakis <kalast@gmail.com>2014-12-05 18:42:39 +0300
committerAntony Riakiotakis <kalast@gmail.com>2014-12-05 18:42:59 +0300
commit787743b1edd1b8ee4cca5f394fc32a946249a318 (patch)
treed42cc8023f0409989a35f57f1042d13c4a5436a5 /source/blender/windowmanager/wm.h
parent0a7eb30cee25eabd32d372d10c08dcde2437384a (diff)
Add back an extra paramater to the intersection function to determine
the highlighted part of the widget.
Diffstat (limited to 'source/blender/windowmanager/wm.h')
-rw-r--r--source/blender/windowmanager/wm.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index d0bf5a72cea..72d6dbc3909 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -63,9 +63,6 @@ typedef struct wmWidget {
/* determines 3d intersection by rendering the widget in a selection routine. */
void (*render_3d_intersection)(const struct bContext *C, struct wmWidget *widget, int selectionbase);
- /* initialize the operator properties when the user clicks the widget */
- int (*initialize_op)(struct bContext *C, const struct wmEvent *event, struct wmWidget *widget, struct PointerRNA *ptr);
-
/* handler used by the widget. Usually handles interaction tied to a widget type */
int (*handler)(struct bContext *C, const struct wmEvent *event, struct wmWidget *widget, struct wmOperator *op);
@@ -76,10 +73,12 @@ typedef struct wmWidget {
* used in calculations of scale */
void (*get_final_position)(struct wmWidget *widget, float vec[3]);
- int flag; /* flags set by drawing and interaction, such as highlighting */
-
/* activate a widget state when the user clicks on it */
int (*activate_state)(struct bContext *C, const struct wmEvent *event, struct wmWidget *widget, int state);
+
+ int flag; /* flags set by drawing and interaction, such as highlighting */
+
+ unsigned char highlighted_part;
/* center of widget in space, 2d or 3d */
float origin[3];