← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/space_node/node_select.c

  • Committer: Bazaar Package Importer
  • Author(s): Kevin Roy
  • Date: 2011-06-24 11:13:28 UTC
  • mto: (14.1.6 experimental) (1.5.1)
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: james.westby@ubuntu.com-20110624111328-27ribg6l36edf2ay
Tags: upstream-2.58-svn37702
Import upstream version 2.58-svn37702

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_node/node_select.c
1
1
/*
2
 
 * $Id: node_select.c 36278 2011-04-21 17:25:58Z campbellbarton $
 
2
 * $Id: node_select.c 37246 2011-06-06 11:04:54Z nazgul $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
70
70
 
71
71
/* ****** Click Select ****** */
72
72
 
73
 
static bNode *node_mouse_select(SpaceNode *snode, ARegion *ar, const short mval[2], short extend)
 
73
static bNode *node_mouse_select(SpaceNode *snode, ARegion *ar, const int mval[2], short extend)
74
74
{
75
75
        bNode *node;
76
76
        float mx, my;
102
102
{
103
103
        SpaceNode *snode= CTX_wm_space_node(C);
104
104
        ARegion *ar= CTX_wm_region(C);
105
 
        short mval[2];
 
105
        int mval[2];
106
106
        short extend;
107
107
        bNode *node= NULL;
108
108
        
124
124
 
125
125
static int node_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
126
126
{
127
 
        ARegion *ar= CTX_wm_region(C);
128
 
        short mval[2];  
129
 
        
130
 
        mval[0]= event->x - ar->winrct.xmin;
131
 
        mval[1]= event->y - ar->winrct.ymin;
132
 
        
133
 
        RNA_int_set(op->ptr, "mouse_x", mval[0]);
134
 
        RNA_int_set(op->ptr, "mouse_y", mval[1]);
 
127
        RNA_int_set(op->ptr, "mouse_x", event->mval[0]);
 
128
        RNA_int_set(op->ptr, "mouse_y", event->mval[1]);
135
129
 
136
130
        return node_select_exec(C,op);
137
131
}
199
193
                /* this allows border select on empty space, but drag-translate on nodes */
200
194
                SpaceNode *snode= CTX_wm_space_node(C);
201
195
                ARegion *ar= CTX_wm_region(C);
202
 
                short mval[2];
203
196
                float mx, my;
204
 
                
205
 
                mval[0]= event->x - ar->winrct.xmin;
206
 
                mval[1]= event->y - ar->winrct.ymin;
207
 
                
208
 
                /* get mouse coordinates in view2d space */
209
 
                mx= (float)mval[0];
210
 
                my= (float)mval[1];
211
 
                
212
 
                UI_view2d_region_to_view(&ar->v2d, mval[0], mval[1], &mx, &my);
 
197
 
 
198
                UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &mx, &my);
213
199
                
214
200
                if (node_under_mouse(snode->edittree, mx, my))
215
201
                        return OPERATOR_CANCELLED|OPERATOR_PASS_THROUGH;
229
215
        ot->invoke= node_border_select_invoke;
230
216
        ot->exec= node_borderselect_exec;
231
217
        ot->modal= WM_border_select_modal;
 
218
        ot->cancel= WM_border_select_cancel;
232
219
        
233
220
        ot->poll= ED_operator_node_active;
234
221