diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-10-16 19:28:57 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-10-16 19:28:57 +0400 |
| commit | 282b0d528da179320aabfa2ffe4f4aff32a5b4cb (patch) | |
| tree | d3968fbccb2c0e0b71f68868448f3868c92fe932 /source/blender/src/outliner.c | |
| parent | 6468b1705bfba89221c239898fab563eca6838d3 (diff) | |
* fix totblock error when quiting blender with sessions open
* add "Disconnect"-menu when RMB on verse server that is connected in
outliner
Diffstat (limited to 'source/blender/src/outliner.c')
| -rw-r--r-- | source/blender/src/outliner.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 6b66eff56fb..237c4144221 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -1632,7 +1632,7 @@ static int do_outliner_mouse_event(SpaceOops *soops, TreeElement *te, short even } switch(event) { case 1: - end_verse_session(session, 1); + end_verse_session(session); break; case 2: vnode = session->nodes.lb.first; @@ -1677,9 +1677,9 @@ static int do_outliner_mouse_event(SpaceOops *soops, TreeElement *te, short even if(!(vserver->flag & VERSE_CONNECTING) && !(vserver->flag & VERSE_CONNECTED)) { event = pupmenu("VerseServer %t| Connect %x1"); } else if((vserver->flag & VERSE_CONNECTING) && !(vserver->flag & VERSE_CONNECTED)) { - event = pupmenu("VerseServer %t| Connecting... %x2"); + event = pupmenu("VerseServer %t| Connecting %x2"); } else if(!(vserver->flag & VERSE_CONNECTING) && (vserver->flag & VERSE_CONNECTED)) { - event = pupmenu("VerseServer %t| Connected %x3"); + event = pupmenu("VerseServer %t| Disconnect %x3"); } switch(event) { case 1: @@ -1687,7 +1687,9 @@ static int do_outliner_mouse_event(SpaceOops *soops, TreeElement *te, short even vserver->flag |= VERSE_CONNECTING; break; case 2: + break; case 3: + end_verse_session(vserver->session); break; } } |