[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55854] trunk/blender/source/blender/ editors/space_outliner/outliner_select.c: Clicking on an outliner object in an unselected scene switches to the scene but doesn 't set it as the active object

[Dan Eicher]

Revision: 55854
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55854
Author:   dna
Date:     2013-04-06 21:37:35 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Clicking on an outliner object in an unselected scene switches to the scene but doesn't set it as the active object 

Based on commit soc-2012-bratwurst:r48292 by Jorge Rodriquez

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48292

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner_select.c

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_select.c	2013-04-06 19:46:16 UTC (rev 55853)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_select.c	2013-04-06 21:37:35 UTC (rev 55854)
@@ -209,7 +209,7 @@
 	}
 	
 	/* find associated base in current scene */
-	base = BKE_scene_base_find(scene, ob);
+	base = BKE_scene_base_find(sce, ob);
 
 	if (base) {
 		if (set == 2) {
@@ -221,22 +221,22 @@
 		}
 		else {
 			/* deleselect all */
-			BKE_scene_base_deselect_all(scene);
+			BKE_scene_base_deselect_all(sce);
 			ED_base_object_select(base, BA_SELECT);
 		}
 
 		if (recursive) {
 			/* Recursive select/deselect for Object hierarchies */
-			do_outliner_object_select_recursive(scene, ob, (ob->flag & SELECT) != 0);
+			do_outliner_object_select_recursive(sce, ob, (ob->flag & SELECT) != 0);
 		}
 
 		if (C) {
 			ED_base_object_activate(C, base); /* adds notifier */
-			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
+			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, sce);
 		}
 	}
 	
-	if (ob != scene->obedit)
+	if (ob != sce->obedit)
 		ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO);
 		
 	return 1;