kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

[#21523] Drag Immediately only working when "Select With" is set to LMB

Browse Source 
Partial fix. Check lauch event if left or right mouse.

Also added a bug fix for manipulator (sometimes, type = 0)
This commit is contained in:
Martin Poirier 2010-03-14 18:58:14 +00:00
parent 7ecba90f65
commit 9b660f3425
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/transform/transform.c
View File

@ -1046,7 +1046,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
/* confirm transform if launch key is released after mouse move */
/* XXX Keyrepeat bug in Xorg fucks this up, will test when fixed */
if (event->type == LEFTMOUSE /*t->launch_event*/ && t->state != TRANS_STARTING)
if (event->type == t->launch_event && (t->launch_event == LEFTMOUSE || t->launch_event == RIGHTMOUSE) && t->state != TRANS_STARTING)
{
t->state = TRANS_CONFIRM;
}
@ -1456,6 +1456,22 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int
t->launch_event = event ? event->type : -1;
if (t->launch_event == EVT_TWEAK_R)
{
t->launch_event = RIGHTMOUSE;
}
else if (t->launch_event == EVT_TWEAK_L)
{
t->launch_event = LEFTMOUSE;
}
// XXX Remove this when wm_operator_call_internal doesn't use window->eventstate (which can have type = 0)
// For manipulator only, so assume LEFTMOUSE
else if (t->launch_event == 0)
{
t->launch_event = LEFTMOUSE;
}
if (!initTransInfo(C, t, op, event)) // internal data, mouse, vectors
{
return 0;