diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-23 11:46:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-23 11:46:34 +0400 |
| commit | 01d4748e5feec2daf695aaabee84155c5b1ef91a (patch) | |
| tree | 3bb4eea3971b6e2bc7f79544945effc857322ab9 /source/blender/editors/space_logic | |
| parent | 2ed155b98a52108a39133185b145ceee0d21ebf8 (diff) | |
| parent | 4a4a3b4989355c699b72a8dc15df09fd47621528 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22704:22717
Diffstat (limited to 'source/blender/editors/space_logic')
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index cda79ea0764..06bd95f060f 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -1314,10 +1314,16 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short * proper compatibility with older .blend files. */ str= "Type %t|Left button %x1|Middle button %x2|" "Right button %x4|Wheel Up %x5|Wheel Down %x6|Movement %x8|Mouse over %x16|Mouse over any%x32"; - uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44, width-20, 19, + uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44, (width*0.8f)-20, 19, &ms->type, 0, 31, 0, 0, "Specify the type of event this mouse sensor should trigger on"); + if(ms->type==32) { + uiDefButBitS(block, TOG, SENS_MOUSE_FOCUS_PULSE, B_REDR, "Pulse",(short)(xco + 10) + (width*0.8f)-20,(short)(yco - 44), + (short)(0.20 * (width-20)), 19, &ms->flag, 0.0, 0.0, 0, 0, + "Moving the mouse over a different object generates a pulse"); + } + yco-= ysize; break; } |