archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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.

Browse Source
This commit is contained in:
Campbell Barton
2008-01-22 00:56:35 +00:00
parent 38255fcc6f
commit 9f441976a2
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/object_drop.py
View File

@@ -1,7 +1,7 @@
#!BPY #!BPY
""" """
Name: 'Drop Onto Ground' Name: 'Drop Onto Ground'
Blender: 243 Blender: 245
Group: 'Object' Group: 'Object'
Tooltip: 'Drop the selected objects onto "ground" objects' Tooltip: 'Drop the selected objects onto "ground" objects'
""" """
@@ -221,4 +221,5 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
main() main()
GLOBALS.clear() GLOBALS.clear()

2
release/scripts/object_timeofs_follow_act.py
View File

@@ -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 ***** # ***** BEGIN GPL LICENSE BLOCK *****
# #

8
source/blender/src/outliner.c
View File

@@ -1919,7 +1919,7 @@ static int do_outliner_mouse_event(SpaceOops *soops, TreeElement *te, short even
/* activate a name button? */ /* activate a name button? */
if(event==LEFTMOUSE) { 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)) 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"); error("Cannot edit builtin name");
else if(tselem->id->lib) { 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; tselem->flag |= TSE_TEXTBUT;
} }
} else { } else {
if (G.qual & LR_SHIFTKEY) {
if(tselem->id->lib && tselem->type==0) {
notice(tselem->id->lib->name);
}
}
/* always makes active object */ /* always makes active object */
tree_element_active_object(soops, te); tree_element_active_object(soops, te);