[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55855] trunk/blender/source/blender/ editors/space_outliner/outliner_select.c: Whoops, revert r55854 and use r48292 as is
Dan Eicher
dan at trollwerks.org
Sat Apr 6 23:48:39 CEST 2013
Revision: 55855
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55855
Author: dna
Date: 2013-04-06 21:48:39 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Whoops, revert r55854 and use r48292 as is
Turns out outliner_search_back() doesn't always return a valid scene...
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55854
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 21:37:35 UTC (rev 55854)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_select.c 2013-04-06 21:48:39 UTC (rev 55855)
@@ -206,10 +206,11 @@
sce = (Scene *)outliner_search_back(soops, te, ID_SCE);
if (sce && scene != sce) {
ED_screen_set_scene(C, CTX_wm_screen(C), sce);
+ scene = sce;
}
/* find associated base in current scene */
- base = BKE_scene_base_find(sce, ob);
+ base = BKE_scene_base_find(scene, ob);
if (base) {
if (set == 2) {
@@ -221,22 +222,22 @@
}
else {
/* deleselect all */
- BKE_scene_base_deselect_all(sce);
+ BKE_scene_base_deselect_all(scene);
ED_base_object_select(base, BA_SELECT);
}
if (recursive) {
/* Recursive select/deselect for Object hierarchies */
- do_outliner_object_select_recursive(sce, ob, (ob->flag & SELECT) != 0);
+ do_outliner_object_select_recursive(scene, 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, sce);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
}
}
- if (ob != sce->obedit)
+ if (ob != scene->obedit)
ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO);
return 1;
More information about the Bf-blender-cvs
mailing list