[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13344] trunk/blender: outliner messed up shift+clicking on linked objects - would display their library path rather then selecting them .

[Campbell Barton]

Revision: 13344
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13344
Author:   campbellbarton
Date:     2008-01-22 01:56:35 +0100 (Tue, 22 Jan 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/release/scripts/object_drop.py
    trunk/blender/source/blender/src/outliner.c

Modified: trunk/blender/release/scripts/object_drop.py
===================================================================
--- trunk/blender/release/scripts/object_drop.py	2008-01-22 00:53:10 UTC (rev 13343)
+++ trunk/blender/release/scripts/object_drop.py	2008-01-22 00:56:35 UTC (rev 13344)
@@ -1,6 +1,6 @@
 #!BPY
 """
-Name: 'Drop Onto Ground'
+Name: 'TimeOffset from Active's Path'
 Blender: 243
 Group: 'Object'
 Tooltip: 'Drop the selected objects onto "ground" objects'
@@ -221,4 +221,4 @@
 if __name__ == '__main__':
 	main()
 
-GLOBALS.clear()
\ No newline at end of file
+GLOBALS.clear()

Modified: trunk/blender/source/blender/src/outliner.c
===================================================================
--- trunk/blender/source/blender/src/outliner.c	2008-01-22 00:53:10 UTC (rev 13343)
+++ trunk/blender/source/blender/src/outliner.c	2008-01-22 00:56:35 UTC (rev 13344)
@@ -1919,7 +1919,7 @@
 			/* 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 @@
 						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);