sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bugfix [#23720] Performing an object operation in the Outliner in Visible Layers display mode causes CTD

Browse Source
This commit is contained in:
Campbell Barton 2010-09-08 03:34:45 +00:00
parent ecbb170bb0
commit 5b428e9158
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/space_outliner/outliner.c
View File

@ -3220,7 +3220,7 @@ static void group_linkobs2scene_cb(bContext *C, Scene *scene, TreeElement *te, T
}
}
static void outliner_do_object_operation(bContext *C, Scene *scene, SpaceOops *soops, ListBase *lb,
static void outliner_do_object_operation(bContext *C, Scene *scene_act, SpaceOops *soops, ListBase *lb,
void (*operation_cb)(bContext *C, Scene *scene, TreeElement *, TreeStoreElem *, TreeStoreElem *))
{
TreeElement *te;
@ -3231,16 +3231,18 @@ static void outliner_do_object_operation(bContext *C, Scene *scene, SpaceOops *s
if(tselem->flag & TSE_SELECTED) {
if(tselem->type==0 && te->idcode==ID_OB) {
// when objects selected in other scenes... dunno if that should be allowed
Scene *sce= (Scene *)outliner_search_back(soops, te, ID_SCE);
if(sce && scene != sce) {
ED_screen_set_scene(C, sce);
Scene *scene_owner= (Scene *)outliner_search_back(soops, te, ID_SCE);
if(scene_owner && scene_act != scene_owner) {
ED_screen_set_scene(C, scene_owner);
}
/* important to use 'sce' not scene else deleting objects can crash */
operation_cb(C, sce, te, NULL, tselem);
/* important to use 'scene_owner' not scene_act else deleting objects can crash.
* only use 'scene_act' when 'scene_owner' is NULL, which can happen when the
* outliner isnt showing scenes: Visible Layer draw mode for eg. */
operation_cb(C, scene_owner ? scene_owner : scene_act, te, NULL, tselem);
}
}
if((tselem->flag & TSE_CLOSED)==0) {
outliner_do_object_operation(C, scene, soops, &te->subtree, operation_cb);
outliner_do_object_operation(C, scene_act, soops, &te->subtree, operation_cb);
}
}
}