[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23947] trunk/blender: - fixed python error when there is no active object

[Campbell Barton]

Revision: 23947
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23947
Author:   campbellbarton
Date:     2009-10-19 13:39:57 +0200 (Mon, 19 Oct 2009)

Log Message:
-----------
- fixed python error when there is no active object
- made sequence strip selection more like object mode - only de-select the active with Shift+RMB

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2009-10-19 11:11:35 UTC (rev 23946)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2009-10-19 11:39:57 UTC (rev 23947)
@@ -1233,7 +1233,6 @@
 		view = context.space_data
 		gs = context.scene.game_data
 		ob = context.object
-		mesh = context.active_object.data
 		
 		col = layout.column()
 		col.itemR(view, "display_floor", text="Grid Floor")
@@ -1243,7 +1242,8 @@
 		col.itemR(view, "outline_selected")
 		col.itemR(view, "all_object_centers")
 		col.itemR(view, "relationship_lines")
-		if ob.type =='MESH':
+		if ob and ob.type =='MESH':
+			mesh = context.active_object.data
 			col.itemR(mesh, "all_edges")
 		
 		col = layout.column()

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c	2009-10-19 11:11:35 UTC (rev 23946)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c	2009-10-19 11:39:57 UTC (rev 23947)
@@ -296,8 +296,8 @@
 
 	short mval[2];	
 	
-	Sequence *seq,*neighbor;
-	int hand,sel_side, shift= 0; // XXX
+	Sequence *seq,*neighbor, *act_orig;
+	int hand,sel_side;
 	TimeMarker *marker;
 
 	if(ed==NULL)
@@ -311,7 +311,7 @@
 	if (marker) {
 		int oldflag;
 		/* select timeline marker */
-		if (shift) {
+		if (extend) {
 			oldflag= marker->flag;
 			if (oldflag & SELECT)
 				marker->flag &= ~SELECT;
@@ -326,6 +326,7 @@
 	} else {
 	
 		seq= find_nearest_seq(scene, v2d, &hand, mval);
+		act_orig= ed->act_seq;
 
 		if(extend == 0 && linked_left==0 && linked_right==0)
 			deselect_all_seq(scene);
@@ -344,7 +345,7 @@
 				}
 			}
 	
-			if(extend && (seq->flag & SELECT)) {
+			if(extend && (seq->flag & SELECT) && ed->act_seq == act_orig ) {
 				switch(hand) {
 				case SEQ_SIDE_NONE:
 					if (linked_left==0 && linked_right==0)