diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-01-22 03:56:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-01-22 03:56:35 +0300 |
| commit | 9f441976a24eb818926ee8e5fcc94437e4f2e90c (patch) | |
| tree | af48ff3b71dc02ef7cb698aa9c3eaffb41d694df | |
| parent | 38255fcc6f976dacfcc59308ff52e9cbe26448ad (diff) | |
outliner messed up shift+clicking on linked objects - would display their library path rather then selecting them. displaying library path could be useful but should add elsewhere.
| -rw-r--r-- | release/scripts/object_drop.py | 5 | ||||
| -rw-r--r-- | release/scripts/object_timeofs_follow_act.py | 2 | ||||
| -rw-r--r-- | source/blender/src/outliner.c | 8 |
3 files changed, 5 insertions, 10 deletions
diff --git a/release/scripts/object_drop.py b/release/scripts/object_drop.py index 4ea8bde2ca8..63a0bd574fb 100644 --- a/release/scripts/object_drop.py +++ b/release/scripts/object_drop.py @@ -1,7 +1,7 @@ #!BPY """ Name: 'Drop Onto Ground' -Blender: 243 +Blender: 245 Group: 'Object' Tooltip: 'Drop the selected objects onto "ground" objects' """ @@ -221,4 +221,5 @@ def main(): if __name__ == '__main__': main() -GLOBALS.clear()
\ No newline at end of file +GLOBALS.clear() + diff --git a/release/scripts/object_timeofs_follow_act.py b/release/scripts/object_timeofs_follow_act.py index c81cb7296e7..83863da7d8f 100644 --- a/release/scripts/object_timeofs_follow_act.py +++ b/release/scripts/object_timeofs_follow_act.py @@ -13,7 +13,7 @@ __bpydoc__= """ """ # -------------------------------------------------------------------------- -# Drop Objects v1.0 by Campbell Barton (AKA Ideasman42) +# TimeOffset follow Active v1.0 by Campbell Barton (AKA Ideasman42) # -------------------------------------------------------------------------- # ***** BEGIN GPL LICENSE BLOCK ***** # diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index ed910607040..63f39608f5d 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -1919,7 +1919,7 @@ static int do_outliner_mouse_event(SpaceOops *soops, TreeElement *te, short even /* activate a name button? */ if(event==LEFTMOUSE) { - if (G.qual & LR_CTRLKEY) { + if (G.qual == LR_CTRLKEY) { if(ELEM8(tselem->type, TSE_NLA, TSE_DEFGROUP_BASE, TSE_CONSTRAINT_BASE, TSE_MODIFIER_BASE, TSE_SCRIPT_BASE, TSE_POSE_BASE, TSE_R_LAYER_BASE, TSE_R_PASS)) error("Cannot edit builtin name"); else if(tselem->id->lib) { @@ -1930,12 +1930,6 @@ static int do_outliner_mouse_event(SpaceOops *soops, TreeElement *te, short even tselem->flag |= TSE_TEXTBUT; } } else { - - if (G.qual & LR_SHIFTKEY) { - if(tselem->id->lib && tselem->type==0) { - notice(tselem->id->lib->name); - } - } /* always makes active object */ tree_element_active_object(soops, te); |